summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager.cpp
diff options
context:
space:
mode:
author Craig Mautner <cmautner@google.com> 2014-03-25 21:23:15 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-03-25 21:23:15 +0000
commit4abb86c05dcdf5db69873ca484dc018b014e0eb4 (patch)
tree5e2215e330f02f712aef78ac32b5909af114b36c /libs/androidfw/AssetManager.cpp
parent561ffd248fe67d9e583dd1b5dbf3deb7b02a394b (diff)
parent732d5aaa3bf50c06f3a7f306221613f4625610f3 (diff)
am 732d5aaa: am 12b575bd: am 9bbd2f97: (-s ours) am 2cacc619: Merge "Don\'t wait for finishing animation when second display is disconnected"
* commit '732d5aaa3bf50c06f3a7f306221613f4625610f3': Don't wait for finishing animation when second display is disconnected
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions