tree a6699bd25c3d87e7ec129b7217ec20ee965f0ba0
parent c8684d517aeae248b0579ef7fcb4d31ff28e59a3
parent abe293b9508d82de9a161279ab0a7c57196b3842
author Christopher Tate <ctate@google.com> 1480982987 +0000
committer android-build-merger <android-build-merger@google.com> 1480982987 +0000

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

Change-Id: I7f8ce6dbb313d592b97b41a982e629680eba36c4