tree 6f14c3dcdc4db17ee8deb68736336ce008435a36
parent 344f5c5c39fffcc4b591072a5927b5e28cea8c72
parent 2ae24604d40d4d12b3c670064e027deaba3d8b69
author Yabin Cui <yabinc@google.com> 1454526011 +0000
committer android-build-merger <android-build-merger@google.com> 1454526011 +0000

Merge "uncrypt: add options to setup bcb and clear bcb." am: e3434279c8
am: 2ae24604d4

* commit '2ae24604d40d4d12b3c670064e027deaba3d8b69':
  uncrypt: add options to setup bcb and clear bcb.