| commit | 64176158e7ce9c99365d20433c81012ea7e36729 | [log] [tgz] |
|---|---|---|
| author | Ken Wakasa <kwakasa@google.com> | Sat Sep 13 10:41:19 2014 +0900 |
| committer | Ken Wakasa <kwakasa@google.com> | Sat Sep 13 10:41:19 2014 +0900 |
| tree | c238bc7e10cb1a29d713b397feac8302b9ab8351 | |
| parent | 8ed81f9fd74d648fe0adc9ffc0bd2d247105ebe5 [diff] | |
| parent | 75513e5113ab31c4c508e19b3b42de6a9caf10ee [diff] |
resolved conflicts for merge of 75513e51 to master Change-Id: I058c3e63e5e349b58b2bdd2723cb43fbc24a0425