| commit | 66ce420c325fe32a4da67f8a9a0914a093df2f42 | [log] [tgz] |
|---|---|---|
| author | Andy Stadler <stadler@android.com> | Fri Sep 17 19:16:26 2010 -0700 |
| committer | Andy Stadler <stadler@android.com> | Fri Sep 17 19:16:26 2010 -0700 |
| tree | a7452915e9df2ea381f4b52f5cf65c45959ba71f | |
| parent | 591b5edf255a5872fbfb5424f3ee0028fd036d08 [diff] | |
| parent | 97903767d36c597a4c7ee9979c15d36688134209 [diff] |
resolved conflicts for merge of 97903767 to gingerbread-plus-aosp Change-Id: Ic71831342d8e7d548b3d082a97486b40e0636994