| commit | 2c684acab5810cf55780457bda7e5c8895ed1037 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:13:52 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:13:52 2013 -0700 |
| tree | 086371415d8314887be09620a85f20d47dcbf2ba | |
| parent | 75a0a0b0ece29241b4712126af53841d5dcdb442 [diff] | |
| parent | 44e6d244fa7b7fb39b4488f6b8e54e3b6bb6e605 [diff] |
am 44e6d244: am 1f170438: (-s ours) am 17d6b4c1: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '44e6d244fa7b7fb39b4488f6b8e54e3b6bb6e605':