| commit | 6bfc93cdd3639de37876776eb2ebd6284327610b | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Tue Sep 21 16:47:04 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Sep 21 16:47:04 2010 -0700 |
| tree | fd048de62b31e986ae326142e088998809d9504d | |
| parent | dca24b8ad8f6f067d511efe0966808afffc8174d [diff] | |
| parent | 85c3fe443f7bd06ae0aae6074f4cf2960892cdc0 [diff] |
Merge "resolved conflicts for merge of aa522ac8 to master"