OSDN Git Service

resolve merge conflicts of 55d9927 to nyc-mr1-dev-plus-aosp
authorDimitry Ivanov <dimitry@google.com>
Wed, 11 May 2016 23:23:56 +0000 (16:23 -0700)
committerDimitry Ivanov <dimitry@google.com>
Wed, 11 May 2016 23:23:56 +0000 (16:23 -0700)
commit19a446715b3d1e44f9c8870f8e2bf686023516c8
treeddee6233050cab66ef4b64681dfc7e35ec278ce0
parente7fe9b39135b2589bdb3d680f1f95d6d4859d37d
parent55d9927b20ab951e2573b4dd58880114b39a2222
resolve merge conflicts of 55d9927 to nyc-mr1-dev-plus-aosp

Change-Id: Ic40f4a55fcfe641e78bed73230d1202c3ff307e1