| commit | 1954242cb27c68ef311abb3fa12c607145a10d7b | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:41:59 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:41:59 2013 -0700 |
| tree | f7d2a206b03920b6c819925f52a99afd80a2b9ab | |
| parent | e365ed0cb095eed5fbc6a86c21642113e2c24f21 [diff] | |
| parent | 83e25988078d0c80e07c2055e21f1dc5fcbca0bd [diff] |
am 83e25988: (-s ours) am 294cefd4: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '83e25988078d0c80e07c2055e21f1dc5fcbca0bd':