Tobias Thierer 301bf35e2d resolve merge conflicts of 5c9e47d28b to oc-mr1-dev-plus-aosp ...

Test: This merge conflict was automatically resolved by meld.
      The automatic resolution of the same merge conflict by meld
      from cherrypicking this CL into internal-master has passed
      Treehugger (and was already submitted).
Exempt-From-Owner-Approval: Resolving merge conflicts with no deltas
Change-Id: I61f15aeb79c1ad26cc7c51be2af59ecb7b672a7b

2017-10-19 15:33:17 +00:00

..

android

resolve merge conflicts of 5c9e47d28b to oc-mr1-dev-plus-aosp

2017-10-19 15:33:17 +00:00