| commit | c09444eb5b66a5702db99d9b7de23cb73bf11aa4 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:31:59 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:31:59 2013 -0700 |
| tree | 536b56e71c13fdb51e562a15b96e93a7cb9cd052 | |
| parent | c560a67b12350102ba237fa70cedc7c972ad4e4b [diff] | |
| parent | f91bd41c46ec8bd085c361ea0bdf53efe13c87ca [diff] |
am f91bd41c: am 1c302caf: (-s ours) am c14a7fbd: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'f91bd41c46ec8bd085c361ea0bdf53efe13c87ca':