OSDN Git Service

am 877e9de6: am e6d4aba3: am 7090c92f: Merge "Update enable oem unlock warning" into...
authorAndres Morales <anmorales@google.com>
Mon, 24 Nov 2014 18:12:15 +0000 (18:12 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 24 Nov 2014 18:12:15 +0000 (18:12 +0000)
commitee47e0219e45ea3a280b07ae011aa498f86430d0
tree04c78a967a7015bba81a8f98f2acf63bd7e7d503
parentd57c79bcc37049c914598fe652091e9bd4599eee
parent877e9de67b69c77bd34452c28b1b0a4739da1d90
am 877e9de6: am e6d4aba3: am 7090c92f: Merge "Update enable oem unlock warning" into lmp-mr1-dev

* commit '877e9de67b69c77bd34452c28b1b0a4739da1d90':
  Update enable oem unlock warning
res/values/strings.xml
src/com/android/settings/DevelopmentSettings.java