tree 2a5e19bbd3aee9255e758ac0ecb779328ffd9e14
parent 97393adb08c55fc9c6ebf54ef8f6feb6803211b8
parent f597bbffa63b7aab1c6fb82cc8b0997ca64a0e99
author Chris Craik <ccraik@google.com> 1484258545 +0000
committer android-build-merger <android-build-merger@google.com> 1484258545 +0000

resolve merge conflicts of 89cdd4cb to mnc-dev am: d2fd12358d am: 684a68075e am: bf0a8eefb0 am: 51e1a563a3 am: 8906021aec am: 7901c75979 am: 200bf8583d am: d3a5ff7bfe
am: f597bbffa6

Change-Id: I21956c8ea41beef73447ab3bacd82ff55086b88d