tree 39be7efa1c8c5af9c6288c53fc2130a2392631a5
parent 83327c2c6d10595af0f8df594a824a4c00951cb3
parent 9ef37cdcdc17f19c94fb184048a01b1031b61fe8
author Christopher Tate <ctate@google.com> 1480984280 +0000
committer android-build-merger <android-build-merger@google.com> 1480984280 +0000

resolve merge conflicts of 13c5c34 to mnc-dev am: 79b74d787d am: abe293b950 am: 02e4440eab am: 953c05276e am: e37a4dc7c4 am: 8ed5e3d7ca am: 9d5dd3f584
am: 9ef37cdcdc

Change-Id: If8528d119a88f444b6dba5e1328be93c93123897