| commit | 255aad90bd09b5d970fa1fbb8cd78ed225b1697d | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:44:42 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:44:42 2013 -0700 |
| tree | 02641ebaa7a0a94ff39d26f401c958890357e098 | |
| parent | 20f6258edcb9982ee231406f857ec52f7e886c2e [diff] | |
| parent | 60196a2c3cc10738c2b4c1ee9fc8493c0b1250bc [diff] |
am 60196a2c: am 255d05c9: am 0b4d9ad3: am e7c34e82: (-s ours) am 8c1b3289: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '60196a2c3cc10738c2b4c1ee9fc8493c0b1250bc':