| commit | a60f38181465d5f5a37ea8f9ad34326ea2e21ef0 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:35:36 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:35:36 2013 -0700 |
| tree | 94a4d6555ccfc85af79cfe0cffe5be2782f07ab5 | |
| parent | 60ac09bdb2ddc4076f78a91f260cd5a1e179c82b [diff] | |
| parent | b2525ba8a0f91594df17e893d036c416a109b012 [diff] |
am b2525ba8: am 7915b22e: am a4b20d71: am b8e1033c: (-s ours) am e5412a9a: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'b2525ba8a0f91594df17e893d036c416a109b012':