| commit | 2116c3cd2fe71dda35b2f7cbc246fa191312f87b | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Thu Oct 22 19:15:24 2015 -0700 |
| committer | Daniel Xie <dxie@google.com> | Thu Oct 22 19:15:24 2015 -0700 |
| tree | 7dce421d2bb7c3e17b771ed700b5db061aec5aaa | |
| parent | ace696d5ac9b20b76401321f004b7912aaa490cb [diff] | |
| parent | 49daa6e6db00326b9120ee863ad784814d67a1a2 [diff] |
resolve merge conflicts of 49daa6e6db to mnc-dev. Change-Id: I42bc78454dfc912ccea7f39aeef41d4241b79095