| commit | 2788852c01fde3d6b695fee0ac13fd348bb556c1 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:44:41 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:44:41 2013 -0700 |
| tree | 473e392069d9b1fe095d8dbb70f6ee6f04b418cb | |
| parent | d4f12a1bb64bbfe889cd7cabfa3ad583c38e8002 [diff] | |
| parent | fee815efd3673907d3fcd6d4d1dbd6a2070ead46 [diff] |
am fee815ef: am 0049a47e: am 834f2f66: am 61d900bd: (-s ours) am 28bf428c: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'fee815efd3673907d3fcd6d4d1dbd6a2070ead46':