| commit | ebb34d471480ae1d170985ea4a14cdf867220c08 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Feb 05 13:41:58 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 05 13:41:58 2013 -0800 |
| tree | dea8369b11b8eef66a856d620d2bf5671dc4e958 | |
| parent | fc37a0172db7197e6e0702dfa9bfdd6bed1947b1 [diff] | |
| parent | c7739bd594041037cc8aaa511a6182e875116e05 [diff] |
am c7739bd5: (-s ours) Reconcile with jb-mr1.1-release - do not merge # Via The Android Automerger (1) and The Android Open Source Project (1) * commit 'c7739bd594041037cc8aaa511a6182e875116e05':