OSDN Git Service

am 3007a85e: am d6d0cd53: Merge "Bring up factory reset UI when decryption fails...
authorPaul Lawrence <paullawrence@google.com>
Wed, 13 Aug 2014 20:00:51 +0000 (20:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 13 Aug 2014 20:00:51 +0000 (20:00 +0000)
commit5ae69f791947a977bf48a747449f6c0dbea6e04b
treeb7162a894ce458e656406b850d184ed92789c41c
parentad0a630bac1411914091483ac0950961f2d60d27
parent3007a85e1136d942c6805c9384688b233565d782
am 3007a85e: am d6d0cd53: Merge "Bring up factory reset UI when decryption fails but password is correct" into lmp-dev

* commit '3007a85e1136d942c6805c9384688b233565d782':
  Bring up factory reset UI when decryption fails but password is correct