| commit | 7398664de30cf953b791ab5aeeb37dfd57410698 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:44:39 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:44:39 2013 -0700 |
| tree | 5a1d6deaceee8a0181d2bfe3fb2e1f55e76ed78c | |
| parent | 53a0288463c3fd88fb7f2cfa37c0e985eb1870f4 [diff] | |
| parent | c8b3fee48ca53150b38d84c70e2679f91d293efb [diff] |
am c8b3fee4: am f9094401: am 75f29709: am 09b43645: (-s ours) am 92b2cd23: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'c8b3fee48ca53150b38d84c70e2679f91d293efb':