tree eef57c43ab499db94457761ab2ed80b63fc463cc
parent a2be0c622854bcc2cb0de6681f454c7aa70a2d8c
parent 857983c3b89955785fa69919304f8e713b57c524
author Xin Li <delphij@google.com> 1484183197 +0000
committer android-build-merger <android-build-merger@google.com> 1484183197 +0000

resolve merge conflicts of 20bd2d02c5 to nyc-mr1-dev-plus-aosp
am: 857983c3b8

Change-Id: I3225996e0ee155b0bdec183d9ccd75a5fd38bfc2