summaryrefslogtreecommitdiff
path: root/libs/hwui/DeferredLayerUpdater.cpp
diff options
context:
space:
mode:
author Zhihai Xu <zhihaixu@google.com> 2014-03-12 15:19:30 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-03-12 15:19:30 +0000
commitf110416dcc7fd34ee183c5ae70761a14ab188a05 (patch)
tree1068f359eb14ba99f8e754a81ec60331e49efd25 /libs/hwui/DeferredLayerUpdater.cpp
parentfb403d587906a315ae3ca5ce1958d9d9637777f6 (diff)
parent42703d1199ea4770f505db0d5d8c9eb7d076e0d4 (diff)
am 42703d11: (-s ours) am cb714ae6: am 74f36d31: am c48c9626: am 82ec1442: Merge "DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""" into klp-dev
* commit '42703d1199ea4770f505db0d5d8c9eb7d076e0d4': DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""
Diffstat (limited to 'libs/hwui/DeferredLayerUpdater.cpp')
0 files changed, 0 insertions, 0 deletions