OSDN Git Service

resolve merge conflicts of c992484 to nyc-mr1-dev-plus-aosp
authorDimitry Ivanov <dimitry@google.com>
Thu, 28 Apr 2016 05:16:54 +0000 (22:16 -0700)
committerDimitry Ivanov <dimitry@google.com>
Thu, 28 Apr 2016 05:16:54 +0000 (22:16 -0700)
commite881b04ea1a366283cb8722030f7715b4b15a497
tree1226631d42b78f4d1b5d09bf8fe685096e1280ab
parent11bed69223608d48865bca51f8858227d447f0da
parentc992484595ffa696d27f92b0586d190c62022aff
resolve merge conflicts of c992484 to nyc-mr1-dev-plus-aosp

Change-Id: I50906a1f278b90a1adc99c8fefc46028c11ef610