| commit | 960d919e814726f05ad1a9b82e6a9677f9977f15 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Sat Feb 08 10:31:36 2014 -0800 |
| committer | Ying Wang <wangying@google.com> | Sat Feb 08 10:31:46 2014 -0800 |
| tree | 6467a4fa91af2edee74930ba37ae77f94409ffdc | |
| parent | a6e8c6c1e0f659b3532bd86631104360b54016ea [diff] | |
| parent | 4df82b3e30794a3652a5dda773a74f486fec3325 [diff] |
resolved conflicts for merge of 4df82b3e to klp-dev-plus-aosp Change-Id: I7a1d9e1954ede06a818814bd05a77c69f1ed3bc6