diff options
| author | Jeff Sharkey <jsharkey@google.com> | 2017-02-03 00:45:39 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-03 00:45:39 +0000 |
| commit | ee958351b7feaa70b04c7689207d57bafa8db094 (patch) | |
| tree | a246c27eda434542bd8c1c0f6023994441a739f9 /tools/aapt2/diff/Diff.cpp | |
| parent | 928574895bb5be40e8086b86ff94a910a0a1fe0b (diff) | |
| parent | f19cea14cf3e42374e96896b1cc4ba1564a5dd69 (diff) | |
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev am: e6be8d765f am: 8f4f4daf2c am: 7c0ea478a8 am: 2848738526 -s ours
am: f19cea14cf
Change-Id: I80e9b340be8824005055d2fc9ab9effa49a3e5d2
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions