| commit | 871e481b7b333fe0c1e3dc2ebb857ab2f1110731 | [log] [tgz] |
|---|---|---|
| author | Brad Fitzpatrick <bradfitz@android.com> | Tue Aug 24 12:55:43 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Aug 24 12:55:43 2010 -0700 |
| tree | 9535013ef46bc8c2bb119e23ead0c28f5b894a94 | |
| parent | d7f58093cc20b96f4baedc616e871d2457685647 [diff] | |
| parent | 2e20f7e478c70dca1bb2d748ed06b5d0f45584ae [diff] |
Merge "resolved conflicts for merge of 0b7b9807 to master"