tree 276c5da8bc7948d3179dc1305b75ac62d7287a12
parent 968a3d72a44b95d25e64f686874b62690d9d9956
parent 21793c32beb6474f30c32c035281b278f42388fe
author Tao Bao <tbao@google.com> 1465871132 +0000
committer android-build-merger <android-build-merger@google.com> 1465871132 +0000

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

Change-Id: I0656e3b6863fad36654b030b9bbdf05724969a29