| commit | f9ad69f467c2207e6e8ec995c2b73dde0f6a787f | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:47:15 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:47:15 2013 -0700 |
| tree | 1accede5e43bb6ad38058079de2f839ad5bd22f3 | |
| parent | 917e120f736f95292a40b6c7da9940d6369955e1 [diff] | |
| parent | 803b245ef485f16245234a42b8885a2ec50c5e5a [diff] |
am 803b245e: (-s ours) am 469dbc0a: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '803b245ef485f16245234a42b8885a2ec50c5e5a':