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