diff options
| author | Jeff Sharkey <jsharkey@google.com> | 2017-02-03 00:57:39 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-03 00:57:39 +0000 |
| commit | bafa3c1d3b436fdaa31dabaeb49bc0d9b125c887 (patch) | |
| tree | 3d82a5c37f20684a796e0128e6dab1093f7089ef /tools/aapt2/diff/Diff.cpp | |
| parent | cdb996355e4bd1a5fbc150ab5e34897a4dbe6c25 (diff) | |
| parent | 394357761ec1d1733cd7a43e7b5fa1cc0be5e189 (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
am: 394357761e -s ours
Change-Id: I8330da471c2770612f2898339f567b05853a2479
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions