diff options
| author | Mahaver Chopra <mahaver@google.com> | 2016-06-16 16:53:43 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-16 16:53:43 +0000 |
| commit | d3a0f10b8df7117d87e1b7a2a21f2d49c48bb6ed (patch) | |
| tree | 9f6200e049977ed99ea4f3d4964968cf7c5931d9 /tools/aapt2/diff/Diff.cpp | |
| parent | b901e4c4e6df832c8d10f25e7b5aaecbc9c6fbea (diff) | |
| parent | 186768150f0ed1f68a331d175c0808b2031667c9 (diff) | |
Merge \"Global.OEM_UNLOCK_DISALLOWED should only restrict when enabling oem\" into nyc-mr1-dev
am: 186768150f
Change-Id: Id35463500a31ff6e6d834c706e228d05c5d15918
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions