| commit | 5caa45bbc1a0fa4d0eb2c696a0cda38e416d1530 | [log] [tgz] |
|---|---|---|
| author | Walter Jang <wjang@google.com> | Wed Mar 30 08:56:34 2016 -0700 |
| committer | Walter Jang <wjang@google.com> | Wed Mar 30 08:56:34 2016 -0700 |
| tree | 8047858e0e929cd365aaac3d3ae734e45e3fdbd1 | |
| parent | cef642dcaee08f68135f137c45e5a7ef0b4a8a0e [diff] | |
| parent | 82f4b931fa57a5a4d638461e40165c72db5bc102 [diff] |
resolve merge conflicts of 82f4b93 to master Change-Id: I9cb01e915d6029ffd5f953beb61f76480a406c70