tree 5a665564e666ee76613baf5336f70affe635ee2e
parent ff38526b2210c44c629d92273e6487831050f605
parent 38afad46d874c3446d38ee714f1ee4420de702bd
author Tao Bao <tbao@google.com> 1465870826 +0000
committer android-build-merger <android-build-merger@google.com> 1465870826 +0000

resolve merge conflicts of 490fad6 to nyc-dev-plus-aosp
am: 38afad46d8

Change-Id: I597370534ef1bd4d65fea9e6054a499f88b282e9