tree 21c503d206735c3381862977eaf6a6d195dd6d18
parent 9f31a2bc1b6aaea11ca08313341aef947829b1b7
parent ea718cdb7834444512c376942020bba88a9e9ed0
author Guang Zhu <guangzhu@google.com> 1350087004 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350087004 -0700

am ea718cdb: (-s ours) am 0f23979f: am 18daa175: Merge "DO NOT MERGE: better late than never: fix build id for JB MR1" into jb-mr1-dev

* commit 'ea718cdb7834444512c376942020bba88a9e9ed0':
  DO NOT MERGE: better late than never: fix build id for JB MR1