| commit | d11e25ba5e28f5e090fd95a2cfc230a1892a0d55 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 20:17:59 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 20:17:59 2013 +0000 |
| tree | 0373653afbbadd72b33781a8f67c222c4e312dd1 | |
| parent | a999bc832d7511303c0a40e4838e3130b9bfe8ae [diff] | |
| parent | 109111fd8b6c3bacf51afb61fa5fadc8ad8fe428 [diff] |
am 109111fd: (-s ours) am 1d5c4afa: am 6fdb2a11: am 76b14915: (-s ours) am 61c0f4fa: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '109111fd8b6c3bacf51afb61fa5fadc8ad8fe428':