diff options
author | Jeff Sharkey <jsharkey@google.com> | 2017-02-03 00:12:45 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-02-03 00:12:45 +0000 |
commit | 8f4f4daf2ccefe261b7fb3af9ca6d7e92a3743a7 (patch) | |
tree | c415213d66999f55080104facd973beeb8dde6ac /tools/aapt2/diff/Diff.cpp | |
parent | 3da69c1115a7ba8826fe4d74e73d0f0d6c2c5861 (diff) | |
parent | e6be8d765fcaee0ddd0841afb3e27e6b6cd3e5cc (diff) |
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev
am: e6be8d765f
Change-Id: I502a04687a3a7840860e1a3af0a702f7162a8897
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions