| commit | 1e307dfd0eeca73d4cde1f55e91ee216f4a07eee | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Thu Sep 01 12:08:33 2011 -0700 |
| committer | Brian Carlstrom <bdc@google.com> | Thu Sep 01 12:19:23 2011 -0700 |
| tree | 688acdedfb385f2c1b9032dbe5016f063a6a9e8c | |
| parent | 1015c955c9c04a0282830e36d029dd46a1452c09 [diff] | |
| parent | c5f0a0c57ebba2eef2468cf6a94c1c050e1f1d36 [diff] |
resolved conflicts for merge of c5f0a0c5 to gingerbread-plus-aosp Change-Id: I6264d2fd3d119d0b7dde4ddc961bc128040e206f