diff options
author | Jeff Sharkey <jsharkey@android.com> | 2016-12-02 03:00:16 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-12-02 03:00:16 +0000 |
commit | 5121d75ad067d9648f1f372400be5706ae1bad4d (patch) | |
tree | 843a2dae9193dd913ed0962da7923a52c9574c83 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 90d9fb44d727499ba7da96c80dd6c8d185c0d2e0 (diff) | |
parent | a546f6ff50f71a0e4a9a65471a8246ef54684cec (diff) |
Merge "Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-dev am: 73b49fc7e8 am: 8c456f7f39 am: 5902fdad90 am: f906cf3102 am: 63036e2fec" into nyc-mr2-dev-plus-aosp
am: a546f6ff50 -s ours
Change-Id: I3f2c5d501c0a773f60a01aa5328b481eaeff0bdb
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions