summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorJames Hawkins <jhawkins@google.com>2016-06-03 22:06:41 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-03 22:06:41 +0000
commit45735b4c534f0423b02ac6401e3f3ac903e746fb (patch)
tree54d53f1f88a4f92baf6d1e0c86855a8e201e52fc /tools/aapt2/java/JavaClassGenerator_test.cpp
parentf7b21e1db040b211356e639b5324a4826871de69 (diff)
parenteb47d6205f28d89d8bb1a3e127659dc24727fa7e (diff)
Merge "am/UserController: Log system uptime at two \'boot complete\' markers." into nyc-dev
am: eb47d6205f * commit 'eb47d6205f28d89d8bb1a3e127659dc24727fa7e': am/UserController: Log system uptime at two 'boot complete' markers. Change-Id: I4846c21cb7623c5528ebd51f8bc95d55b40d8536
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions