commit | 0fd6b1d1e2acf2ad5f35f83fcdbdb30f0e1c4eb5 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:24:29 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:24:29 2012 -0800 |
tree | 0b66c9a2749aeaa67eb630f4528172313f256b28 | |
parent | 4cdfb578e5032b37fe61e4580a55f6f39e369e87 [diff] | |
parent | 76572c63b8615b55a7883dcf40024653436be4c9 [diff] |
am 76572c63: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '76572c63b8615b55a7883dcf40024653436be4c9':