diff options
| author | Jeff Sharkey <jsharkey@google.com> | 2017-02-03 00:49:28 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-03 00:49:28 +0000 |
| commit | 394357761ec1d1733cd7a43e7b5fa1cc0be5e189 (patch) | |
| tree | 368af5b5909ce75a6b2ad43cfbe1b5a2cc2bdaa8 /tools/aapt2/diff/Diff.cpp | |
| parent | 56131cf7c063de3046e4575f2b93c2531b1ea7cb (diff) | |
| parent | 4b3c59005b9eb08e418ff9301ed2600a8417e08a (diff) | |
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530 am: 5d65931af5 -s ours am: f82c373074 am: 8c9ff68173
am: 4b3c59005b
Change-Id: Ibc4221c090b1dab98c085486733c987d96c99210
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions