| commit | e47881e655a687a7132af6647b8bcc2fdc784714 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Mar 07 11:45:36 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 07 11:45:36 2013 -0800 |
| tree | 4fab5f7c608fccc81422a7b44284e8966689fd4e | |
| parent | 70e053fbdcae0fcfd684409f957bd7e6734c4827 [diff] | |
| parent | f83722715237d0e80297e7d22ee5dd79d0624fe7 [diff] |
am f8372271: (-s ours) am 17cbfdda: (-s ours) am 76bbd39a: (-s ours) am 22c22cf7: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'f83722715237d0e80297e7d22ee5dd79d0624fe7':