summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2014-12-17 00:41:01 +0000
committerandroid-build-merger <android-build-merger@google.com>2014-12-17 00:41:01 +0000
commit899ec23fb6834a655700f6ebb374afad38ab2460 (patch)
tree440204667a688a6569e81747c1a64c72828b7d3b /tools/aapt2/java/JavaClassGenerator_test.cpp
parentb59e28cd4b2f6f421694d3cc0e175239bb38f326 (diff)
parent41a42c73e6b6bc17ae4582c9ecf8d15ba32ca3d0 (diff)
am 50d8e5b0: am d3836e9d: Merge "Revert "Allow home to be pressed while in incoming call screen"" into lmp-mr1-dev
automerge: 41a42c7 * commit '41a42c73e6b6bc17ae4582c9ecf8d15ba32ca3d0': Revert "Allow home to be pressed while in incoming call screen"
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions