summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorChristopher Tate <ctate@google.com>2015-01-20 23:02:23 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-01-20 23:02:23 +0000
commit78a05de82daffdf746c252b49f12ef88073b0459 (patch)
tree2c07d0585435133744e256db6db5457fd64df7ce /tools/aapt2/java/JavaClassGenerator_test.cpp
parent76e9d18055d131bede49886c9c86c9f59db3fac4 (diff)
parent14c33f6a716f224d1bc821cd8aa062f5734c29bf (diff)
Merge "Don\'t try to launch broadcast receivers during boot" into lmp-mr1-dev
automerge: 14c33f6 * commit '14c33f6a716f224d1bc821cd8aa062f5734c29bf': Don't try to launch broadcast receivers during boot
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions