diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2016-06-29 01:38:01 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-06-29 01:38:02 +0000 |
commit | 634ed6bc1742ea0a65ff552de0001b7278d16fb5 (patch) | |
tree | ed8b3128a3fb2fd26aa2b69a6431a3818657a6e3 /tools/aapt2/diff/Diff.cpp | |
parent | 2d8c91f238e49889a1315301c5e9266faff549bc (diff) | |
parent | 0271fd661dc547e15495e31913d5cde4f122dde9 (diff) |
Merge changes Id876f01f,If7c94cf8 into nyc-mr1-dev
* changes:
Improving the Reset Demo Warning dialog
Enabling auto-ota in retail demo mode
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions