diff options
| author | David Brazdil <dbrazdil@google.com> | 2016-06-02 16:41:12 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-02 16:41:12 +0000 |
| commit | a5e81480b16e8cbf5a3c4f015b667893defb1456 (patch) | |
| tree | 8256952f011a695bbb687d20cdf046de9dfa8352 /tools/aapt2/diff/Diff.cpp | |
| parent | 0e6207ef406d1fad389a9831e6c8816b274ad2b5 (diff) | |
| parent | c4f1bc40326c10fde55f07230e3fe3067d70fbfa (diff) | |
Merge "Do not update packages in encrypted state" into nyc-dev
am: c4f1bc4032
* commit 'c4f1bc40326c10fde55f07230e3fe3067d70fbfa':
Do not update packages in encrypted state
Change-Id: I84c2c77fb8ff2cc12095f5217c6960a156f2faf3
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions