| commit | aeba1bc0c333f145469fc17a10c0bbcebd6dc30b | [log] [tgz] |
|---|---|---|
| author | Hung-ying Tyan <tyanh@google.com> | Sun Oct 03 01:17:29 2010 +0800 |
| committer | Hung-ying Tyan <tyanh@google.com> | Sun Oct 03 01:18:34 2010 +0800 |
| tree | 6e8f07cd392c03ca63d145fbe79539143b92ac34 | |
| parent | bdf11be97bd732e8891ae19342c937da6e659afa [diff] |
Revert "Revert "resolved conflicts for merge of 8788d140 to master"" This reverts commit bdf11be97bd732e8891ae19342c937da6e659afa. Fix a missing import from manual merge. Change-Id: If373626f07250cbfe07e5c04cf02ad9ee5a0ab2a