| commit | 82884deb0ebf452086484b845d46545172933255 | [log] [tgz] |
|---|---|---|
| author | Dan Morrill <morrildl@google.com> | Mon Oct 18 15:43:18 2010 -0700 |
| committer | Dan Morrill <morrildl@google.com> | Mon Oct 18 16:11:35 2010 -0700 |
| tree | 7c387736a3c1d82b02540c27035814b946e6fc17 | |
| parent | 45e30006664ecbf527c72b859f71e30c83cee04b [diff] | |
| parent | b7eb8cdad900fc0ddd2d6a7fd79ab7a716c62841 [diff] |
Merge commit 'b7eb8cdad900fc0ddd2d6a7fd79ab7a716c62841' into mergefix Conflicts: res/values/strings.xml Change-Id: I5da845de77ffd95c5008fdc081cc1e3abef4fad5