tree 23e36fa7022d206e02486b57beee965f3065e4fa
parent 0b23389fc7ae47597bb56563f4ce909c80818d67
parent 4fd6c26410cd210a7948f94407d9b2f551badbdc
author Tao Bao <tbao@google.com> 1453336059 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1453336059 +0000

Merge "Stop rebooting into recovery if uncrypt fails."