| commit | 130952d1c9069d9fb6921c26bc345967025c9be1 | [log] [tgz] |
|---|---|---|
| author | Mike Lockwood <lockwood@android.com> | Thu Oct 07 10:57:08 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Oct 07 10:57:08 2010 -0700 |
| tree | 84bdf76b4c62e93196d25480e2426d5f09be8079 | |
| parent | 3db1a4c16fa12a5ea0dccd8311e339c739f741fa [diff] | |
| parent | e36abb1a900128339e8cbe3bde87dd7d92842bd4 [diff] |
Merge "resolved conflicts for merge of 6327a9fe to master"