| commit | 3e4fd64307a66941a36718df7ab5fa04e093f10f | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Wed May 13 10:10:38 2015 -0700 |
| committer | Mark Salyzyn <salyzyn@google.com> | Wed May 13 10:10:38 2015 -0700 |
| tree | 0aabb628287e9e74cba9121ecdc8605c6e048fa4 | |
| parent | 8feae6c39b11416f4c33c1560d3ba57242b2fdbb [diff] | |
| parent | 5a8a0a2a2d1aface1da1bada5151f671d61ffa33 [diff] |
resolved conflicts for merge of a1aacb71 to mnc-dev-plus-aosp Change-Id: I44f02fbb65e7834f0fe20ab8f20aefe3f3b1e725