resolve merge conflicts of 037808f59 to oc-mr1-dev
authorMika Isojärvi <misojarvi@google.com>
Fri, 22 Sep 2017 18:44:23 +0000 (11:44 -0700)
committerMika Isojärvi <misojarvi@google.com>
Fri, 22 Sep 2017 20:55:14 +0000 (13:55 -0700)
commit863b6fc0e5406d6069b4a6ff41d11e330858a33f
tree1913c15af75b131e909e9741c3423b3a6b672d9d
parentc6b2df70ee3d8acd4d23da1116edcd6b3e5b26a0
parent037808f5983e993dac4dd7ab0d366e44e9247327
resolve merge conflicts of 037808f59 to oc-mr1-dev

Bug: 65677277
Test: Ran scripts/check_build_sanity.py build Android CTS.
Change-Id: I0befb24161cddbe1d94ec60ce5a0438907986f31
Android.mk