OSDN Git Service

am 91afae6c: resolved conflicts for merge of dd14acc3 to jb-mr1-dev
authorJean-Baptiste Queru <jbq@google.com>
Fri, 10 Aug 2012 19:43:59 +0000 (12:43 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 10 Aug 2012 19:43:59 +0000 (12:43 -0700)
commit84d4afa66e40478a813b738e943d8e9e54abf342
tree199789c202d963438d19e43340c269baa9065927
parentf09cdd928d4874f16a72ce79e3f4a0c749a9abc3
parent91afae6c039d06df83d708834c96d47858406e2a
am 91afae6c: resolved conflicts for merge of dd14acc3 to jb-mr1-dev

* commit '91afae6c039d06df83d708834c96d47858406e2a':
  Modify full_mips-eng build in line with the full-eng build