| commit | fdfb058dcd2b3e0eb8bc75850264883592fa1d3b | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 08 06:32:07 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 08 06:32:07 2012 -0800 |
| tree | 0df79b814d675df887cc9abbe855b350c3b8b7d7 | |
| parent | b72f3628a6201ea48ffdfc3e4a53412c1df926f5 [diff] | |
| parent | 475352453c60cc55936aebf3d045e12fa140857c [diff] |
am 47535245: (-s ours) am 8207b3a1: am 2159898a: Reconcile with jb-mr1-release - do not merge * commit '475352453c60cc55936aebf3d045e12fa140857c':