| commit | 50d36d58369cdf48bc6fcdba96b36c846be8587a | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:00:44 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:00:44 2013 -0700 |
| tree | 788563041118bb8b63b8bb0225227899a39ab7dc | |
| parent | 6426bd62676c743b0b5bdc397bcab5c669c6e51f [diff] | |
| parent | 75bcd737770f85114673c4411b8e2ecc0dd32bdf [diff] |
am 75bcd737: am 4ddcb758: (-s ours) am 9ef024ec: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '75bcd737770f85114673c4411b8e2ecc0dd32bdf':