tree 8534ec414b13719f340fd130c9e539997899a14f
parent 53ea95d0c2646106c25e23757d4939e925bdd282
parent 49ef1342c15cc501d340ebbbc52d5b0763ce3761
author Yabin Cui <yabinc@google.com> 1460180563 +0000
committer android-build-merger <android-build-merger@google.com> 1460180563 +0000

resolve merge conflicts of a58a6db to nyc-dev-plus-aosp
am: 49ef134

* commit '49ef1342c15cc501d340ebbbc52d5b0763ce3761':
  uncrypt: split libbootloader_message_writer for reuse.

Change-Id: Id74ae9fec0e0c6c49af041b46a62fa4a10c23d91