tree 7450e7b9628dc45c39337fe636f719e105d5dd27
parent 3295d1993a1ddbfe17c5d5750f2ca975359662b2
parent 1afa4d7b23ce8b9852cda1f495145f320414c3d4
author Tao Bao <tbao@google.com> 1465014379 -0700
committer Tao Bao <tbao@google.com> 1465014379 -0700

resolve merge conflicts of 1afa4d7 to nyc-mr1-dev-plus-aosp

Change-Id: I8fca64ebdbafe27f02d359619aa60ab82618114a