| commit | 5c8f84a15fba998baf9703c81e86a25048ce368a | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:28:32 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:28:32 2013 -0700 |
| tree | 666c555c513847cfafffb006cd7ae40c9271db84 | |
| parent | 48697f6dc249d1238243677de77d3a0eb6a17b3f [diff] | |
| parent | 3a18bcccb201b37e5b0cdff76febafb214cb8b90 [diff] |
am 3a18bccc: (-s ours) am 431cd416: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '3a18bcccb201b37e5b0cdff76febafb214cb8b90':