| commit | 6195acc2b55425bb7b0d00fcb9af374d90ee5af9 | [log] [tgz] |
|---|---|---|
| author | David Christie <dnchrist@google.com> | Wed Aug 24 13:47:57 2016 -0700 |
| committer | David Christie <dnchrist@google.com> | Wed Aug 24 13:47:57 2016 -0700 |
| tree | c07cb168ffcc36d7a8322dbce8224c1aae53611d | |
| parent | b51e98becbca9c28e37d9806124ecebf6f8d7dd0 [diff] | |
| parent | a2399b45e28fc1097e4a3b1d7d735241e29a3b4f [diff] |
resolve merge conflicts of a2399b4 to mnc-dev Change-Id: Ifc9e13cdb047ef70799ba8b1b9e91357ef5f2d2a