OSDN Git Service

am d6d0cd53: Merge "Bring up factory reset UI when decryption fails but password...
authorPaul Lawrence <paullawrence@google.com>
Wed, 13 Aug 2014 19:55:41 +0000 (19:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 13 Aug 2014 19:55:41 +0000 (19:55 +0000)
commit3007a85e1136d942c6805c9384688b233565d782
treeb7162a894ce458e656406b850d184ed92789c41c
parenta063a84ce26092001cdded38b416b13dc073fde4
parentd6d0cd53d00a84619f3f90761ee3907732fac898
am d6d0cd53: Merge "Bring up factory reset UI when decryption fails but password is correct" into lmp-dev

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