| commit | 1d5c4afa91fb2b15402a0e57f98d4b00e0a9cfc5 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:57:26 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:57:26 2013 -0700 |
| tree | acfc8b558580f0421840af5f9e94b328e18c1a90 | |
| parent | 4caf0ebebbdd7514f4c12ae14b4cc537d504f20e [diff] | |
| parent | 6fdb2a116c95a51953cf2203b8af0ac84cbeb2b2 [diff] |
am 6fdb2a11: am 76b14915: (-s ours) am 61c0f4fa: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '6fdb2a116c95a51953cf2203b8af0ac84cbeb2b2':