| commit | c26c52a6a0d097e2e28804347d8b0ada758109fa | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Mar 07 11:49:21 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 07 11:49:21 2013 -0800 |
| tree | c54ed61471cfd926dd5a29c3ae0b94d76c762a87 | |
| parent | aaf22c8dd864c9bb8944106d4196969e950d2163 [diff] | |
| parent | e47881e655a687a7132af6647b8bcc2fdc784714 [diff] |
am e47881e6: 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 'e47881e655a687a7132af6647b8bcc2fdc784714':