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