| commit | 84a6c0d298f0606f7c27857b17115cbd362ad637 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 20:05:35 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 20:05:35 2013 +0000 |
| tree | 64807edcb65fd2abd80c19c79cad6986f99ca396 | |
| parent | 6fd59ac07d91eb373f4269a40e688aa82a6ccc6e [diff] | |
| parent | b5bd4fb79544b1939e9f977a88a707bdc90cf66c [diff] |
am b5bd4fb7: (-s ours) am 2f50df00: am c09444eb: am f91bd41c: am 1c302caf: (-s ours) am c14a7fbd: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'b5bd4fb79544b1939e9f977a88a707bdc90cf66c':