OSDN Git Service

am cb7b83de: am 77287101: am 8fe71068: Merge "Don\'t index the ChooseLockGeneric...
authorAmith Yamasani <yamasani@google.com>
Mon, 25 Aug 2014 08:24:10 +0000 (08:24 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 25 Aug 2014 08:24:10 +0000 (08:24 +0000)
commitb5ba4afdca4e9bb01d9ee03cc583fc4bd0952775
treee9e46ca4825e9ffb52e7a78bc9c9a0029e60addf
parent7cd216144e540a4eccf24965cc31d3998c28bfc8
parentcb7b83de42b13b55030f5d0207f42fcc9e346968
am cb7b83de: am 77287101: am 8fe71068: Merge "Don\'t index the ChooseLockGeneric screen" into lmp-dev

* commit 'cb7b83de42b13b55030f5d0207f42fcc9e346968':
  Don't index the ChooseLockGeneric screen
res/values/strings.xml