commit | 167296d70a022fc65a4e9fda10f3bd13e1d4b428 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 08 15:47:58 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 08 15:47:58 2012 -0800 |
tree | f9d7a16a639049bd357d2185264b6da4451548e3 | |
parent | e0d454d2e86f4170bdab68d45696fb2eb9a87f9f [diff] | |
parent | 5c0da20cbe442794d68106c3c5ee8cd88fee9291 [diff] |
am 5c0da20c: am 71a408b9: Reconcile with jb-mr1-release - do not merge * commit '5c0da20cbe442794d68106c3c5ee8cd88fee9291':