resolve merge conflicts of 433645782 to oc-dev-plus-aosp
authorPyry Haulos <phaulos@google.com>
Mon, 3 Apr 2017 01:17:46 +0000 (18:17 -0700)
committerPyry Haulos <phaulos@google.com>
Mon, 3 Apr 2017 01:17:46 +0000 (18:17 -0700)
commit3a33181ba4c0c944df636e3ea3f905fd45bc065b
treef7c7ccd5e074e71e0de8efc4e675c9ebe2191b37
parent52bce38cb64346a71e7846f61854a6d99c06a9bb
parent433645782506cbdf8fa8b113ea0b5aa8ae761f0c
resolve merge conflicts of 433645782 to oc-dev-plus-aosp