| commit | 8ed81f9fd74d648fe0adc9ffc0bd2d247105ebe5 | [log] [tgz] |
|---|---|---|
| author | Ken Wakasa <kwakasa@google.com> | Sat Sep 13 09:25:23 2014 +0900 |
| committer | Ken Wakasa <kwakasa@google.com> | Sat Sep 13 09:25:23 2014 +0900 |
| tree | 033b9c08832cad074d69b07033a535fb57e7e923 | |
| parent | 6297897fccf4628d83e206f0f75131b928eec529 [diff] | |
| parent | 8e9385cc0993da711e97881a4122f11041f15730 [diff] |
resolved conflicts for merge of 8e9385cc to master Change-Id: Ia6d192ee4a8496afa3f788894844ebef78fb7a8c