OSDN Git Service

am 8826a64a: am 1f06a89f: Merge "Get correct factory reset reason from encryption...
authorPaul Lawrence <paullawrence@google.com>
Mon, 15 Sep 2014 23:54:56 +0000 (23:54 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 15 Sep 2014 23:54:56 +0000 (23:54 +0000)
* commit '8826a64a6cd4a44b55033557e5b4867bcf131e35':


Trivial merge