| commit | ec618dc585d8e2f89cc107769cfb9fb313e7fd93 | [log] [tgz] |
|---|---|---|
| author | Mahaver Chopra <mahaver@google.com> | Wed Jul 13 12:27:00 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jul 13 12:27:03 2016 +0000 |
| tree | bc7f0cecdf3788edea7af80d5dd3298c4b7755ea | |
| parent | 987eadbd4b019d8c41661f76f1ff943a2f490d0a [diff] | |
| parent | 6bc19a2e5cebbb76a6dc6f825cac548c6933c536 [diff] |
Merge "Use UM.DISALLOW_OEM_UNLOCK instead of Global.OEM_UNLOCK_DISALLOWED" into nyc-mr1-dev