summaryrefslogtreecommitdiff
path: root/libs/gui/LayerState.cpp
diff options
context:
space:
mode:
author Michael Wright <michaelwr@google.com> 2015-08-07 22:58:53 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-08-07 22:58:53 +0000
commit9c514ca6b32d3a74c9755bae3ebbcb8024b1cad3 (patch)
tree4f0377aef571dbe7279baed4756e4ea67c73b0a8 /libs/gui/LayerState.cpp
parentdbe1e97133a2bc32d911b426a41e3033f7d25015 (diff)
parent297f8a186ff6d2ee818a92de542735afbd7ab42f (diff)
am 297f8a18: (-s ours) am e14f71ef: am 18108fd6: am 1362ec74: Merge commit \'62ec2dd5\' into mm
* commit '297f8a186ff6d2ee818a92de542735afbd7ab42f': DO NOT MERGE Add new media navigation keys.
Diffstat (limited to 'libs/gui/LayerState.cpp')
0 files changed, 0 insertions, 0 deletions