tree 1913c15af75b131e909e9741c3423b3a6b672d9d
parent c6b2df70ee3d8acd4d23da1116edcd6b3e5b26a0
parent 037808f5983e993dac4dd7ab0d366e44e9247327
author Mika Isojärvi <misojarvi@google.com> 1506105863 -0700
committer Mika Isojärvi <misojarvi@google.com> 1506113714 -0700

resolve merge conflicts of 037808f59 to oc-mr1-dev

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