| commit | 67128cbc3371586b6ae0b428621c8d95fb9561f0 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Mar 05 13:06:23 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 05 13:06:23 2013 -0800 |
| tree | fc38678ab4ac738cd00cd6582fad864e7d3ae553 | |
| parent | 27ae21a3d4c22ef5992dfabb0c29ce7299c1331a [diff] | |
| parent | 18cd97931c60f7595d7d5d4cdfd4344dde20153f [diff] |
am 18cd9793: (-s ours) am 84d3036c: (-s ours) am ed9cc555: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '18cd97931c60f7595d7d5d4cdfd4344dde20153f':