| commit | b4e50fe03c269e0c6b60db1702993ac0649bb5a2 | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Thu Oct 27 14:43:50 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Oct 27 14:43:50 2011 -0700 |
| tree | 434f7873bbe8d68a3a3ee9e6d38e6170eee74a18 | |
| parent | 8805dc137ad2c254f25117a5eb1fd662a4ef63b0 [diff] | |
| parent | e815a585578e0cda32dd08291cdc85fbc6f24c31 [diff] |
Merge "resolved conflicts for merge of b6cf4b7f to ics-mr1" into ics-mr1