commit | 8b9bc71997be1a1627afd93866063ae08a9b9b73 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Nov 14 12:42:50 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 14 12:42:50 2012 -0800 |
tree | ddc8767f7129406486241347f9cc6331753883da | |
parent | 57556d830313ec949dff49d1db5ad308f22d7fb3 [diff] | |
parent | 605d6acbd8eb654f15d3253027e6745aeb1bf67c [diff] |
am 605d6acb: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '605d6acbd8eb654f15d3253027e6745aeb1bf67c': JDP45