tree 8712dfd4670b4e7da1fe8dec1249ca2b4182133f
parent 57dbf1c224be67afc296ef97b70b6a13647d4c83
parent 02e4440eabb004f8d817599b68caf9dba7aa27bc
author Christopher Tate <ctate@google.com> 1480983228 +0000
committer android-build-merger <android-build-merger@google.com> 1480983228 +0000

resolve merge conflicts of 13c5c34 to mnc-dev am: 79b74d787d am: abe293b950
am: 02e4440eab

Change-Id: I66e7e982176555f09bf298325754d708ef0ecac0