tree 12244e0b4f804c93b80d174524c154fb60d436b6
parent 882737b7cb6d541df0b0b9e2b7ef14da1dd95915
parent 199c0b39484e24c5a9a65802adb208c2f3863dce
author Tao Bao <tbao@google.com> 1475091779 -0700
committer Tao Bao <tbao@google.com> 1475091779 -0700

resolve merge conflicts of 199c0b3 to nyc-mr1-dev-plus-aosp

Change-Id: Icde635bb8efd981f9d14bd2d2d471693ebc0958b