resolve merge conflicts of ba455914 to master
authorPyry Haulos <phaulos@google.com>
Fri, 20 Jan 2017 20:29:48 +0000 (20:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 20:29:48 +0000 (20:29 +0000)
commit218bfe74ff91b086d9ee8beb0f2b8b02a245610c
treed6da5d2a2716ddd7f97063153ba06a5b1c8f3c2d
parentbe674b63ba56e5ba0cd580c75ed1b7494c5dc735
parent07a7e24da3d3f04ea6df365a5cc1e5335f6a27a9
resolve merge conflicts of ba455914 to master
am: 07a7e24da3

Change-Id: Iece28ec157fd5f603009ffb6fc9023cc0164ab1d