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

adb: correctly fix merge conflict.

Change-Id: Ic637c0ef5499e2893cd0adfcc41dd5d3481524c2