diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2016-12-02 02:58:18 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-12-02 02:58:18 +0000 |
| commit | 661adb672b24d23b65449310c1da5ce7559602a3 (patch) | |
| tree | 843a2dae9193dd913ed0962da7923a52c9574c83 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | b462665b561549d76ad805b432202a080db3f0a1 (diff) | |
| parent | f5163cec8856359437ae4f3aa7ff60c28f3ffb66 (diff) | |
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 17010dc0d2 am: bc7aae3610 am: 0d774967ba am: 7b1ae648a4 am: b5ee31237f" into nyc-mr2-dev-plus-aosp
am: f5163cec88 -s ours
Change-Id: I5867c5e05d38f8af6f615ae613ddb1ef4ab0b939
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions