commit | df69e578358aa12f612da95113a06a21bbd9d93e | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Oct 11 08:08:26 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 11 08:08:26 2012 -0700 |
tree | ef3eadabdd66dd30392c9a451410c5ad3950294c | |
parent | fb41cd524ad144b9c5b8de74d557249a49723b21 [diff] | |
parent | d612ec14226d082d246d8448637d15888733a8b9 [diff] |
am d612ec14: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'd612ec14226d082d246d8448637d15888733a8b9':