| commit | 684f1cf41bd48cadc94dc5f3f20d6fdadd5c1640 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Fri Mar 18 16:17:20 2011 -0700 |
| committer | Eric Fischer <enf@google.com> | Fri Mar 18 16:17:20 2011 -0700 |
| tree | fb51844e6d8e53dcdfc920e6684092f87b14ef11 | |
| parent | 08a65d2c5b75ac57428d7da718f3e2569f321d4c [diff] | |
| parent | 6a1413b1b2a43b4a824007e853e15b832bb7a95d [diff] |
resolved conflicts for merge of 6a1413b1 to gingerbread-plus-aosp Change-Id: I4ed72126141eadbea8630d4df5384b774260aecd