tree ba7727ee20aa55b19388c55f26004cf16fb24dd1
parent 95b96d98caf6dbaefcfe7b52ba35d27babd70245
parent 65f35b5c3513571c179974829eb93ba069693d2b
author Tao Bao <tbao@google.com> 1456685189 +0000
committer android-build-merger <android-build-merger@google.com> 1456685189 +0000

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

* commit '65f35b5c3513571c179974829eb93ba069693d2b':
  uncrypt: Retire pre-recovery service.