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