tree b9441262f5598ba5a62ef4b5a5b7b186bdc3edc2
parent 25fb74bc838021ea13e3ee028903d09766c8a2f9
parent bc11dd8b7c675ff21ca505d9d67154f04d2862a9
author Tao Bao <tbao@google.com> 1456685275 +0000
committer android-build-merger <android-build-merger@google.com> 1456685275 +0000

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

* commit 'bc11dd8b7c675ff21ca505d9d67154f04d2862a9':
  uncrypt: Retire pre-recovery service.