| commit | cbec21ad422e36d784e481da905ec44ac0cee673 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:00:54 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:00:54 2013 -0700 |
| tree | e05504d30d8b27c0f221dd2cfc2361e27c49c287 | |
| parent | 4913cfe2a356d439a7ba055096c2f2cb0c8ad18c [diff] | |
| parent | f0f706bc6e70b2f1568b4b62119c2bf3a3333247 [diff] |
am f0f706bc: am dda70146: (-s ours) am 77a62c8b: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'f0f706bc6e70b2f1568b4b62119c2bf3a3333247':