| commit | 765ef49ddbceecd2099982e85684cddd4dad93cb | [log] [tgz] |
|---|---|---|
| author | Yang Ni <yangni@google.com> | Mon Apr 13 16:47:31 2015 -0700 |
| committer | Yang Ni <yangni@google.com> | Mon Apr 13 16:47:31 2015 -0700 |
| tree | 385baa841cf0cfa9696bf8ba3355d4dadb0a0ac7 | |
| parent | c7f2f2ffe189a691cf27444abaf1b0647d510676 [diff] | |
| parent | a0be50e40325d45337e8acc0dd15dd4fb19caf52 [diff] |
resolved conflicts for merge of a0be50e4 to master Change-Id: I64555818e265b52efc449a07b07e463786f87ca3