tree 284c3c58d540ef670e6a2ab12b09fb786dfc4a73
parent 661f8a69f2b12f3244deed664ab69a9d2efad7fb
parent 5b3b373a4938b8359bb55c62057fc5771e689add
author Tao Bao <tbao@google.com> 1456685078 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1456685078 +0000

Merge "uncrypt: Retire pre-recovery service." into nyc-dev