tree d9be25bd5df8efdf5da58eedcd46d2b00f381f87
parent 9718b4784ee85ffa4d33d47d9fb39da48566324c
parent a9a9369c6604d74a062af136ca60b8d295d68ae3
author Wei Jia <wjia@google.com> 1452824873 +0000
committer android-build-merger <android-build-merger@google.com> 1452824873 +0000

Merge "Return error for wrong mb_type" into mnc-dev am: e1ac7e3c6c am: 70d01da791
am: a9a9369c66

* commit 'a9a9369c6604d74a062af136ca60b8d295d68ae3':
  Return error for wrong mb_type