| commit | 656a23ba2bfab62aec4e682a998f4f39a3ef0087 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Nov 22 16:46:18 2010 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Nov 22 16:46:18 2010 -0800 |
| tree | 6fce9c949a4e9f62549d0b3d94f15b53ba358109 | |
| parent | e45674e284f690ca9c395811ae0703c276514f2b [diff] | |
| parent | 8503144665894f1b5008f540e0cf36c948c763ef [diff] |
Merge "resolved conflicts for merge of 8484e57f to master"