| commit | e6b059a9a9e2fc8012095d431d53f427efa31fab | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:42:55 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:42:55 2013 -0700 |
| tree | a59a5f7d3c49b87a253ccb0571d2064841efb5f9 | |
| parent | f59af94ec11e83633f7b87659e98c1460477a778 [diff] | |
| parent | 2fa4d0ef9723ac0b459e56ddb5200796f49d4059 [diff] |
am 2fa4d0ef: am 9067a62a: (-s ours) am de97f9c2: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '2fa4d0ef9723ac0b459e56ddb5200796f49d4059':