| commit | af00108ca4e8e3de7c6d155891b74d43c18f5eba | [log] [tgz] |
|---|---|---|
| author | Makoto Onuki <omakoto@google.com> | Tue Mar 08 10:33:42 2016 -0800 |
| committer | Makoto Onuki <omakoto@google.com> | Tue Mar 08 10:39:25 2016 -0800 |
| tree | 399d7f7a59dbdbc9a58879d2e86ab0ce65229166 | |
| parent | e53aaa83ef08e3f52d85b5f5976b945a94bb082b [diff] | |
| parent | 1ca3800c44cf2a532e888d3adcec852708697ac3 [diff] |
resolve merge conflicts of 1ca3800c44 to master Change-Id: I4657cdf99900cd555c3109605e8cbdbb0fed79e6