| commit | 8a6f709e2a33a27a313487b0f3c3a7481b2d5702 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 20:56:13 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 20:56:13 2013 +0000 |
| tree | 22cd3220bdcfbb2b0b4892e1b6c8c22e2a6ec02e | |
| parent | 8487b0fefcbd1664c2d05b0b1edd7a64840878e4 [diff] | |
| parent | c1509400dcf79d65b2624e6fc6e7f667ff9edb29 [diff] |
am c1509400: (-s ours) am 5c19de4d: am 1d6e52d1: am 50d36d58: am 75bcd737: am 4ddcb758: (-s ours) am 9ef024ec: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'c1509400dcf79d65b2624e6fc6e7f667ff9edb29':