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