OSDN Git Service

resolve merge conflicts of 303a851 to nyc-mr2-dev-plus-aosp
authorTao Bao <tbao@google.com>
Wed, 26 Oct 2016 22:50:11 +0000 (15:50 -0700)
committerTao Bao <tbao@google.com>
Wed, 26 Oct 2016 22:50:11 +0000 (15:50 -0700)
Change-Id: I2c128766ccab4c21ef87b0b87c6b6a517e9280b2


Trivial merge