tree 276c5da8bc7948d3179dc1305b75ac62d7287a12
parent 70ff92894e0f50488cc2c14dc607790e141f3431
parent ff38526b2210c44c629d92273e6487831050f605
author Tao Bao <tbao@google.com> 1465871131 +0000
committer android-build-merger <android-build-merger@google.com> 1465871131 +0000

resolve merge conflicts of 2a4386f to nyc-mr1-dev-plus-aosp
am: ff38526b22

Change-Id: I1f1edea0e6bfae1540e84867a4401fdeb543b879