OSDN Git Service

Merge "Bring up factory reset UI when decryption fails but password is correct" into...
authorPaul Lawrence <paullawrence@google.com>
Wed, 13 Aug 2014 19:47:52 +0000 (19:47 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 13 Aug 2014 16:52:03 +0000 (16:52 +0000)
commitd6d0cd53d00a84619f3f90761ee3907732fac898
tree22e06e44d4397b04cc5511267f773e8339f21195
parent5a10a8df0efcf034077cbfcd28dd2e495b8d0441
parent384d8e52b6750b2be7079f8828e4d2f038e22180
Merge "Bring up factory reset UI when decryption fails but password is correct" into lmp-dev