summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-06-15 23:04:12 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-06-15 23:04:14 +0000
commit96c49958d78a07c172f496399e558695ff0f1182 (patch)
tree0351c22493ec87cbf5ba5abce53c266927649f73 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentf162a93e7dc315b179114de06e1a9e8bc6f4a635 (diff)
parent6c6e6ceb5d621c97b3dbd4be53aeb08d8c21a31d (diff)
Merge "Merge \\"Fixing issue with screen pinning screen not showing for secondary users.\\" into nyc-dev am: 9a75ed7ab5 am: 511562ee23" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions