commit | 301bf35e2df9e3f2efa5dbf1c2df69e10be7f6e8 | [log] [tgz] |
---|---|---|
author | Tobias Thierer <tobiast@google.com> | Thu Oct 19 16:12:57 2017 +0100 |
committer | Jeff Sharkey <jsharkey@google.com> | Thu Oct 19 15:33:17 2017 +0000 |
tree | ff127ed004f4707c41fc2d6261b38831f43e6af6 | |
parent | d2ff3244dc64b05b3b9e2bedbdd120a8dfdde022 [diff] | |
parent | 5c9e47d28b249395fa74787065f83769b886c036 [diff] |
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