OSDN Git Service

resolve merge conflicts of cb6e72f to nyc-mr1-dev-plus-aosp
authorDimitry Ivanov <dimitry@google.com>
Fri, 26 Aug 2016 22:38:26 +0000 (15:38 -0700)
committerDimitry Ivanov <dimitry@google.com>
Fri, 26 Aug 2016 22:38:26 +0000 (15:38 -0700)
commite1703b4582ae3adb8b15bc7fab275caa56d7eb10
tree0cceab95c4d7711cc3ac82d364a6ab39da9c7e90
parent53aae1a0d5af1084e31e4ac9fa058c965ab01f03
parentcb6e72f6123fe118dd00c2f7ce42d38ca927e1ee
resolve merge conflicts of cb6e72f to nyc-mr1-dev-plus-aosp

Change-Id: Ibe680bbc473fc5ce1ced2d50e1b8e20149a59a08