tree 04629db86cecb6b49e3add57a39afa469ecf923f
parent 78bac9a66a773396bb4a3ceee589b71046dcc5e1
parent 0c39203698b904e165237f67d6bd013debd6dc47
author Yabin Cui <yabinc@google.com> 1459295606 +0000
committer android-build-merger <android-build-merger@google.com> 1459295606 +0000

resolve merge conflicts of 61799ba to nyc-dev-plus-aosp
am: 0c39203

* commit '0c39203698b904e165237f67d6bd013debd6dc47':
  uncrypt: remove --read-bcb option.

Change-Id: Ic84b20a7736d6c0cd5f4e3ff07a02cbd64e285aa