diff options
| author | Christopher Tate <ctate@google.com> | 2016-05-25 23:16:02 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-25 23:16:02 +0000 |
| commit | 38a37f336f96896146efc1a85310504bf4f77116 (patch) | |
| tree | 0436d86a8fd64712705a1f472363f59f3a2b931a /tools/aapt2/diff/Diff.cpp | |
| parent | f950ec9b1adeea9eea2fa323164030cdae07ee26 (diff) | |
| parent | c69aa838a8f89ba7476ce554ecf5a19a6de78b28 (diff) | |
Merge "Backport of backup transport whitelist" into mnc-dev am: 2cfc6baa22 am: 600d4f61ca
am: c69aa838a8
* commit 'c69aa838a8f89ba7476ce554ecf5a19a6de78b28':
Backport of backup transport whitelist
Change-Id: I0151279dfa467d6f456c2cfb4066cbc2ff4f7365
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions