summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2017-01-31 01:15:24 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-01-31 01:15:29 +0000
commita0325c8513a8904f2d3f9c8f6e191a08bcdfc232 (patch)
treec8cafcada1dac2163a6722bb2f8492e30e0c171e /tools/aapt2/diff/Diff.cpp
parentefdc6635695df115a1d5759b022cb7f9f7bdc45e (diff)
parent26b613028255a2180b8c87e7b792bb257e71bff4 (diff)
Merge changes from topic 'am-7c11f830c3cc4f4994e740cad00a8e97'
* changes: Check and send usb state broadcast when devices boots am: af6d473ab0 am: 061bceafee am: df1df40f91 am: 307a387f38 Only send usb disconnect intents after boot. am: c1bc0a844d am: dc9c094deb am: 9877c70d9d am: 1064ee66d5
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions