diff options
| author | Mahaver Chopra <mahaver@google.com> | 2016-06-16 16:49:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-06-16 16:49:12 +0000 |
| commit | 186768150f0ed1f68a331d175c0808b2031667c9 (patch) | |
| tree | 3e9c5a2838ea100ff1b8ebe1350ed7202d6093c6 /tools/aapt2/diff/Diff.cpp | |
| parent | 092d9613676e841093ed1992b559aea455d56548 (diff) | |
| parent | d444ff120774ef87710ee3106534ea7ca44baa5d (diff) | |
Merge "Global.OEM_UNLOCK_DISALLOWED should only restrict when enabling oem" into nyc-mr1-dev
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions