| commit | 49b2ebe8b3521ccc552949fc242a5a4f29b4e72a | [log] [tgz] |
|---|---|---|
| author | Jake Hamby <jhamby@google.com> | Tue May 10 15:52:15 2011 -0700 |
| committer | Jake Hamby <jhamby@google.com> | Tue May 10 15:52:15 2011 -0700 |
| tree | 8512226a79f62883a13c20ce7c20ba4e26fa2e1a | |
| parent | eb03b6a1f404905c429b089cb0d6a887aae1e97e [diff] | |
| parent | 002083a227967e907c3273f544585f5b7abadc77 [diff] |
resolved conflicts for merge of 18cc814c to honeycomb-plus-aosp Change-Id: I2b569ada3baec2dc486296623063bc2b504c5e96