tree e62bd114de748ec41f4515fbd81ab8e7cf032475
parent 6273c0673f0a467669fb14e34eb15e91e86114c1
parent 39ef2d7f3ddb58408f67ee320edb685c35bb9bdf
author Tao Bao <tbao@google.com> 1490749111 -0700
committer Tao Bao <tbao@google.com> 1490749111 -0700

resolve merge conflicts of 39ef2d7f to oc-dev-plus-aosp

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