OSDN Git Service

resolve merge conflicts of d227b61 to nyc-dev-plus-aosp
authorDimitry Ivanov <dimitry@google.com>
Thu, 28 Apr 2016 05:21:31 +0000 (22:21 -0700)
committerDimitry Ivanov <dimitry@google.com>
Thu, 28 Apr 2016 05:21:31 +0000 (22:21 -0700)
Change-Id: I27136bf06295898584ba6cac3a81bec9c9b70f05


Trivial merge