tree 38560ddcc54278accfbeb4be467c10e6b28924ff
parent f344ce50a90029258293ecdc63e7f452002b3a57
parent 982294a5984a757b839809ec9c699369a26d00b6
author Sarah Hu <xiaoyinh@google.com> 1492212275 -0700
committer Sarah Hu <xiaoyinh@google.com> 1492212283 -0700

resolve merge conflicts of 982294a598 to oc-dev

Test: I solemnly swear I tested this conflict resolution.

Change-Id: I1cd0cb564becf51536651ed2af7d216b26dfecce