| commit | e61906f92cdf50e6221f0911b1f47c107e2181dc | [log] [tgz] |
|---|---|---|
| author | Ningyuan Wang <nywang@google.com> | Tue Oct 11 20:43:30 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Oct 11 20:43:30 2016 +0000 |
| tree | 0635e829bc9a56a231d1187c56532c3e0c77b0fc | |
| parent | b3c997c5f528977db0ba170d17ca738d58ebedc6 [diff] | |
| parent | 583dc0e86d4702474b26cd8382b817fedd2cf333 [diff] |
resolve merge conflicts of 849c5c7 to mnc-dev am: 29a2baf319 am: 583dc0e86d Change-Id: Icb42e14df9441a300840603b49407dcc05130b9d