| commit | c8b3fee48ca53150b38d84c70e2679f91d293efb | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:13:49 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:13:49 2013 -0700 |
| tree | bba3a27acfdaca34826b554ece66083bcdc89de2 | |
| parent | 822ea9b3d1cf240b16135e1b5c3bd926c02d17d6 [diff] | |
| parent | f9094401491ecee8e574b294a22e850bfc2b5043 [diff] |
am f9094401: am 75f29709: am 09b43645: (-s ours) am 92b2cd23: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'f9094401491ecee8e574b294a22e850bfc2b5043':