| commit | 5989f4edc5ba74d59412a1966a8e977cfebe79df | [log] [tgz] |
|---|---|---|
| author | Gilles Debunne <debunne@google.com> | Mon Aug 23 11:42:24 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Aug 23 11:42:24 2010 -0700 |
| tree | 8b3e089a8156fddb1344de2f3b4bea5630684c4c | |
| parent | a1f1174b396cda7bdff469a2e974a737600c5eb0 [diff] | |
| parent | 252b36379fedd0c91125679170a56d080d05ae9f [diff] |
Merge "resolved conflicts for merge of a842d143 to master"