| commit | 769c601b912337b09d0baa97f34ea000ccbeab5d | [log] [tgz] |
|---|---|---|
| author | Tianjie Xu <xunchang@google.com> | Tue Oct 18 15:46:56 2016 -0700 |
| committer | Tianjie Xu <xunchang@google.com> | Tue Oct 18 15:46:56 2016 -0700 |
| tree | 80a77c46e825a4a2b3bf1ed6f319effde4db4b6e | |
| parent | 7293ebd4deb49e8010695b5aafabf321f9edbb8e [diff] | |
| parent | 34486c5d2ba5e3fd766763bbfc957ba43faa9d42 [diff] |
resolve merge conflicts of 34486c5 to master Change-Id: I12fc8eb4760bd6c4ae5c97583eb6c659122c9fa9