summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorIan Pedowitz <ijpedowitz@google.com>2015-11-11 21:54:42 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-11-11 21:54:42 +0000
commit44df02fc17bb0f3f1c445166c6cbd7f4d92b4eb6 (patch)
tree3b15d0cf631e5cc41462aa5d213c8710c6966368 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentbdc6cd29303b12ca2fcd8e865f1bb6550b01652f (diff)
parent4f22c781b614322fe3790d314a527ac10471a63a (diff)
Merge "Revert "Fix race condition when setting default ringtones"" into mnc-dr-dev am: 88d4cc1001
am: 4f22c781b6 * commit '4f22c781b614322fe3790d314a527ac10471a63a': Revert "Fix race condition when setting default ringtones"
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions