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