tree 7db736667547b51f268ee66a47967caab34a7c78
parent 8d7cc71aa7848e8486c4385bf7251b3b9f85a561
parent 6128e113b0e169a48dc4a7fcb93b01f68084f44d
author Christopher Tate <ctate@google.com> 1480984530 +0000
committer android-build-merger <android-build-merger@google.com> 1480984530 +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
am: 6128e113b0

Change-Id: I36fbe25fa089fe1482f650895b6bf32de3f3c3e7