diff options
author | Android Build Merger (Role) <android-build-merger@google.com> | 2016-12-02 02:16:49 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-12-02 02:16:53 +0000 |
commit | c917a60c2f886003a313aa20a38edf219ec2be58 (patch) | |
tree | 6ed41290737606a89f8f9b3a42590a7aa4d034d4 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | acf9fdbc7522a8d51f272dad4afd199ac9abee1b (diff) | |
parent | 29061d33fdb191623774f956f806941a66450d4d (diff) |
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 1de465bec2 am: b9a0b79675 -s ours am: 1da786d723 am: af5f47caca am: ee8e0e8ae3 am: f70dd1fbc1 -s ours am: 60f17b8505 am: ca44afff8a am: f2688ddcb7 am: f5ab66fd9a am: 14226e7b43" into nyc-mr2-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions