OSDN Git Service

am edfc6a0a: am 628e89e9: am 3f9d8b60: Merge "[Setup] Theme ChooseLockGeneric for...
authorMaurice Lam <yukl@google.com>
Wed, 26 Nov 2014 19:56:48 +0000 (19:56 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 26 Nov 2014 19:56:48 +0000 (19:56 +0000)
* commit 'edfc6a0a5fb4d371272e4b4c80de22c4ff346214':
  [Setup] Theme ChooseLockGeneric for setup wizard

1  2 
AndroidManifest.xml

Simple merge