resolve merge conflicts of e5f7483 to master
authorPyry Haulos <phaulos@google.com>
Wed, 19 Oct 2016 19:16:03 +0000 (19:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 19 Oct 2016 19:16:03 +0000 (19:16 +0000)
commit8e2e181bd661d7f8b879898c2bf2965b0a515819
tree3c141a788cb6f3ff8bf1f81482609b5bc9a36739
parentc5237d72403057bfaa5bac454a2b6dcb2158dc76
parentc4598ea31bf939fe13c8b8dd02264c24a04bd8f5
resolve merge conflicts of e5f7483 to master
am: c4598ea31b

Change-Id: I61aa10b24cfc71434506c5a83816ce42225b58fd