diff options
| author | Esteban Talavera <etalavera@google.com> | 2016-08-11 18:54:17 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-08-11 18:54:17 +0000 |
| commit | 5c96b0d1abd4e5fe450fb155f62febacec6d2e7c (patch) | |
| tree | 16d90906be45884fbf3b574a3d3b5fb9efad3224 /tools/aapt2/diff/Diff.cpp | |
| parent | 83583bd5963ed9c5867a39437b5336809faf4109 (diff) | |
| parent | fd97e7bc8cac91d849bf40202870c2220fc04f7a (diff) | |
Merge "Do not toggle OEM unlock if bootloader unlocked" into nyc-mr1-dev
am: fd97e7bc8c
Change-Id: I383fd638d92e62a1a83d91c2088b78c6fd4bba3f
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions