OSDN Git Service

resolve merge conflicts of e80bd8c884 to nyc-dev-plus-aosp
authorDimitry Ivanov <dimitry@google.com>
Wed, 2 Mar 2016 01:15:10 +0000 (17:15 -0800)
committerDimitry Ivanov <dimitry@google.com>
Wed, 2 Mar 2016 01:15:10 +0000 (17:15 -0800)
commit28adeeb26d4cbb6cc4f91dd69204bbb474e2f5f7
tree4e95ef9c806a822e21cb2553e72ab65a89c2e382
parentdcdb55ff6ab0a73711ec631f0145b47990e01a3c
parente80bd8c88470eb519fc3c95f523a68df4fe4ea25
resolve merge conflicts of e80bd8c884 to nyc-dev-plus-aosp

Change-Id: Ife166398167859af1ea471016e73a5e0fe03fee7