tree 5c7716f5eb9b664f788160354bc7b1d92c676a9b
parent e67a676fdf3f0c565af64e375075e5386e6ab940
parent 6fec3ba00a1db48a18047de00975bcd09ea0cc1c
author Zhuoyao Zhang <zhuoyao@google.com> 1501042099 -0700
committer Zhuoyao Zhang <zhuoyao@google.com> 1501042155 -0700

resolve merge conflicts of 8d92561 to oc-mr1-dev

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I316f817cdf5e828fe3230cd472d448e96639544c