| commit | 872736e3ca1bd8a615db26c9dacc13ce2acc10a1 | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Thu Sep 23 21:28:38 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Sep 23 21:28:38 2010 -0700 |
| tree | 17ec9a14f6d446967c811141e1b449f24124dd39 | |
| parent | 5e718cddda8cb42f74a88279f82b25adc77ce0cf [diff] | |
| parent | 8f6bab0b8f3edb565ce4ba63e55e55749df4153b [diff] |
Merge "resolved conflicts for merge of 8952a448 to master"