summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorRoboErik <epastern@google.com>2014-09-26 23:03:51 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-26 23:03:51 +0000
commitbee89155e3bc52d3de0a0834e1d0f5af084e7c76 (patch)
treea9eb98bdae7de733bec8324478402d153868a191 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent3f1c8a08c1d8125630d8a6e66d852049c66901ee (diff)
parent507cee74c08f9212e57b6c4a170de1f6c97ffb07 (diff)
am 065b605c: am 55ecb483: Merge "Don\'t forward media keys to the app if the phone session is active" into lmp-dev
* commit '065b605c02e52d76dcd1df211b64f94fc4a18604': Don't forward media keys to the app if the phone session is active
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions