tree f2c12dd304c95f1b3696658c4e91e21b3506f920
parent 4ff7f9f62ae5d283fb62ee87c615a801642cba8f
author Josh Gao <jmgao@google.com> 1470382756 -0700
committer Josh Gao <jmgao@google.com> 1470382756 -0700

adb: correctly fix merge conflict.

Change-Id: Ic637c0ef5499e2893cd0adfcc41dd5d3481524c2