| commit | abac65535d08c3945f40fcaab1fc0910109fd6f3 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Mon Mar 07 10:30:29 2011 -0800 |
| committer | Ying Wang <wangying@google.com> | Mon Mar 07 10:30:29 2011 -0800 |
| tree | d9374a78d62b184309e142126d7fb4bc7a4f8d67 | |
| parent | fd7293711394c422711ff07d15a357955ff2194f [diff] | |
| parent | 08929fd6715b2b6a02f25b23704923d98c15a3b9 [diff] |
resolved conflicts for merge of 08929fd6 to honeycomb-plus-aosp Change-Id: Ic771d69d2824d5ff763313f94acf6125fb9bfb4f