| commit | d5a63fb6d763551b31f0dd9563ccc17e4652094b | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:06:40 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:06:40 2013 -0700 |
| tree | 1e33804c56a82cefe4dd183884e0019d7f1b02ab | |
| parent | 59ef364a8888ce8ec05d55f9093536ecf6d43aa6 [diff] | |
| parent | 1ea067001d14ae1a5eb52c9e8c27a9fd9b109c78 [diff] |
am 1ea06700: am cf076e61: (-s ours) am 61c04aad: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '1ea067001d14ae1a5eb52c9e8c27a9fd9b109c78':