tree d59935a24c9e4e8d304c7bb3817323cbf07d3d77
parent 932682e61981cc7c91dc9d5bc291c6d98cd83c28
parent 06b57cefeaadd0e2f02a5c8a8679884366f4345e
author Guang Zhu <guangzhu@google.com> 1353031223 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1353031223 -0800

am 06b57cef: am f0d4d8f3: DO NOT MERGE: change build id to JB MR1.1

* commit '06b57cefeaadd0e2f02a5c8a8679884366f4345e':
  DO NOT MERGE: change build id to JB MR1.1