OSDN Git Service

resolve merge conflicts of d043a840f7f12ce2c54e7d4564a6ac9cfa24dd17 to nyc-mr2-dev...
authorPhilip P. Moltmann <moltmann@google.com>
Tue, 14 Feb 2017 17:43:23 +0000 (09:43 -0800)
committerPhilip P. Moltmann <moltmann@google.com>
Tue, 14 Feb 2017 17:51:16 +0000 (09:51 -0800)
commitb02f8eb241579163688daaa1d959cd4a49fe7c85
treec0b4838b37b7ccbe5f1a60cef5975c043846adbc
parent2e5e232fa72a3ebd1f87db6c75a8d84c4298d450
parentd043a840f7f12ce2c54e7d4564a6ac9cfa24dd17
resolve merge conflicts of d043a840f7f12ce2c54e7d4564a6ac9cfa24dd17 to nyc-mr2-dev-plus-aosp

Test: Clean merge
Change-Id: Ib2420ff793fdf22fd80cfaed7848ff6b8be8d382