| commit | f2854d02e341078cff4f1be6d80293faafe3242b | [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 | 2ec012fa06311ad0e6b94c9161848be293a3a0fe | |
| parent | bfba13c13b47bdff18d9a37fa236fbfe893277c8 [diff] | |
| parent | dec491cf02f1eacedcf9ae0e364783859da28462 [diff] |
Merge "resolved conflicts for merge of 8484e57f to master"