resolve merge conflicts of 5b2571349 to oc-mr1-dev-plus-aosp
authorMika Isojärvi <misojarvi@google.com>
Tue, 5 Sep 2017 18:15:08 +0000 (11:15 -0700)
committerMika Isojärvi <misojarvi@google.com>
Tue, 5 Sep 2017 18:15:08 +0000 (11:15 -0700)
commit40ba3644f719c50e4ca50b38962255fe9d49b29c
tree32271363cdd2e70f82604693b82a31a25e089903
parent32337c27086e6c55e5ed1c9b5483de12665d4214
parent5b2571349bffd20ae44025e59d4e79c823278979
resolve merge conflicts of 5b2571349 to oc-mr1-dev-plus-aosp

Test: Ran check_build_sanity.py.
Change-Id: I57546248a0851acf9bfdae0ce560e4a2006f2141