| commit | 636dc20d1a2ddb44b345be5ad6e04024788ad90b | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Thu Mar 20 15:24:52 2014 -0700 |
| committer | Ying Wang <wangying@google.com> | Thu Mar 20 15:24:52 2014 -0700 |
| tree | 79dd7dc97ae40c4c71590cef0824803c01d7e168 | |
| parent | 994014964fc2e51c1388de707be2204558ca22cc [diff] | |
| parent | ad49527265bff39251bafb3aed9dcb3412f5a6d4 [diff] |
resolved conflicts for merge of ad495272 to master Change-Id: I6b47768f44b1a6136ca31936e19f943ee72cb627