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