| commit | 59901028dfb89c6852e6100346d6b16f0c703ce5 | [log] [tgz] |
|---|---|---|
| author | Ken Wakasa <kwakasa@google.com> | Wed Aug 27 17:57:13 2014 +0900 |
| committer | Ken Wakasa <kwakasa@google.com> | Wed Aug 27 17:57:13 2014 +0900 |
| tree | e2bc03827fb038577a534405a5b6c12528e52bba | |
| parent | 7b8b9bff7868e9e1dae0c261714152d21a76863f [diff] | |
| parent | 59cdbf00103f3255399216ddbe49fb50fbdcaa53 [diff] |
resolved conflicts for merge of 59cdbf00 to master Change-Id: I991ff097b7d1e82b1e833d9cf03e0910a8398306