tree ff127ed004f4707c41fc2d6261b38831f43e6af6
parent d2ff3244dc64b05b3b9e2bedbdd120a8dfdde022
parent 5c9e47d28b249395fa74787065f83769b886c036
author Tobias Thierer <tobiast@google.com> 1508425977 +0100
committer Jeff Sharkey <jsharkey@google.com> 1508427197 +0000

resolve merge conflicts of 5c9e47d28b24 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