| commit | 542a057a2211f5946135dbd8ce3ba79c8a16f7ae | [log] [tgz] |
|---|---|---|
| author | Pawin Vongmasa <pawin@google.com> | Mon Jul 11 16:25:55 2016 -0700 |
| committer | Pawin Vongmasa <pawin@google.com> | Mon Jul 11 16:25:55 2016 -0700 |
| tree | 155b6641619b6cebafeaf0012e9bcda00d33e2f1 | |
| parent | 41af59d88116585975d71f371698613cf8a9a972 [diff] | |
| parent | 8fc0fd206113f3ef1dbf865d78e84c9265bf8067 [diff] |
resolve merge conflicts of 8fc0fd2 to mnc-dev Change-Id: I1935a500e1d7c1c95a2006f08c98d4d04fb9caba