diff options
| author | Jeff Sharkey <jsharkey@google.com> | 2017-02-03 00:12:31 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-03 00:12:31 +0000 |
| commit | 0e09e8c201324506f65c185340cf278e4492e19b (patch) | |
| tree | 3d82a5c37f20684a796e0128e6dab1093f7089ef /tools/aapt2/diff/Diff.cpp | |
| parent | 4d90982846a842131e3fcef29e69228c3fe86642 (diff) | |
| parent | 1f007d14712a8f3c876adf7b75d09afa3538221c (diff) | |
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr1.5-dev
am: 1f007d1471 -s ours
Change-Id: I5fb0f4d1ebf169c8e1309c1d7549d34b362c8328
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions