| commit | 50d0ceed79730a0f20c632faa3981dc6a2daca4d | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Nov 29 10:23:22 2010 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Nov 29 10:23:22 2010 -0800 |
| tree | 6d234984ac16b87b4c01693c0d17265046ed15b6 | |
| parent | f049ff0f841b90f5e7973dba51b37b4e1ec3c960 [diff] | |
| parent | 062f8a09d7ec047c5b0529f141b95c49fbbd9561 [diff] |
Merge "resolved conflicts for merge of af7bd11e to master"