OSDN Git Service

resolve merge conflicts of acc275a to nyc-dev-plus-aosp
authorChih-Hung Hsieh <chh@google.com>
Mon, 25 Apr 2016 22:59:19 +0000 (15:59 -0700)
committerChih-Hung Hsieh <chh@google.com>
Mon, 25 Apr 2016 22:59:19 +0000 (15:59 -0700)
Change-Id: Ia8f82614a3501d631c074667dfebc5e56e142752


Trivial merge