| commit | df80645a97d994f20a9fba1311a884bf17d2b774 | [log] [tgz] |
|---|---|---|
| author | Nick Pelly <npelly@google.com> | Fri Jan 21 09:29:13 2011 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jan 21 09:29:13 2011 -0800 |
| tree | afc7195db0b2b06de3a8ed0fa6f21a985edd948c | |
| parent | 864df0444254823de71ef86a59d5abce107e1453 [diff] | |
| parent | 8f912d120299e9cbc37b5958e7941d7eb5fb7bd8 [diff] |
Merge "resolved conlifcts for merge of 8c1cd157 to "honeycomb-plus-aosp"" into honeycomb-plus-aosp