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