| commit | c4b1577d6ee8138b06d433b936a21bc18150240b | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Wed Dec 11 15:27:46 2013 -0800 |
| committer | Ying Wang <wangying@google.com> | Wed Dec 11 15:27:46 2013 -0800 |
| tree | 6bca78bec4e5115418239857c7de6f75c3c55a30 | |
| parent | d56f77da5d23812b3e680ca5c61385a9eb54914c [diff] | |
| parent | 1b53b6a7c8bf60400dc95cdf3e77c13e3845a81b [diff] |
resolved conflicts for merge of 1b53b6a7 to master Change-Id: Id08fb8de4f136596fd39b651446ec96fc952427a