tree d397696d01adefe1b0b76a86c8b2530b2dbd5955
parent 9a373a160cbdea1c3cbffac199f315f13e9db83b
parent 1aa74e687ecdd2bef8fb786d8027512b6953b6ad
author Junichi Uekawa <uekawa@google.com> 1447869159 +0000
committer android-build-merger <android-build-merger@google.com> 1447869159 +0000

Merge "Fix non-vendor.img configuration." am: 1337349ea1 am: ef7197eefa
am: 1aa74e687e

* commit '1aa74e687ecdd2bef8fb786d8027512b6953b6ad':
  Fix non-vendor.img configuration.