| commit | 96bee4f12bd2b8ef0c614606364a2493d7ee2915 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Sat Sep 19 17:26:28 2015 -0700 |
| committer | Brian Carlstrom <bdc@google.com> | Sat Sep 19 17:29:42 2015 -0700 |
| tree | 65901e07cf577fa1c88f4406af63cdf5fd0ebfba | |
| parent | 7ba4331f920338b8b75724ce45a2aeb6aa256bbb [diff] | |
| parent | cca75cc9c6a64d386511b474c56085ff2620a470 [diff] |
resolved conflicts for 832a0d1c to mnc-dev Change-Id: Ic46ee60de7bc500f4e1d5fe841524db80918a8d9