| commit | 52805b91b5a4d8a48ed76c0c879b9041051d507e | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:13:31 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:13:31 2013 -0700 |
| tree | d8829fa329ee487bc6e12500d2c893ec6e854c48 | |
| parent | 4a84295940419bee456370d05f3154e1fcb6f74d [diff] | |
| parent | 1d9e1671e0ff4e27ed57951365bff456cbdc4a90 [diff] |
am 1d9e1671: am e5af0899: am f31bca4f: (-s ours) am 2d9e4e9f: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '1d9e1671e0ff4e27ed57951365bff456cbdc4a90':