| commit | 44e6d244fa7b7fb39b4488f6b8e54e3b6bb6e605 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:47:27 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:47:27 2013 -0700 |
| tree | 8a59e0b024c419cfcf3d55e0d41a1c9e6c1d56fc | |
| parent | dacd5de146b413de86d38b6f56a3fe0b2af4b155 [diff] | |
| parent | 1f1704387e7f4b4997797ee575dc4a44b7ae7853 [diff] |
am 1f170438: (-s ours) am 17d6b4c1: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '1f1704387e7f4b4997797ee575dc4a44b7ae7853':