OSDN Git Service

resolve merge conflicts of 8547681 to nyc-mr1-dev-plus-aosp
authorAndre Eisenbach <eisenbach@google.com>
Fri, 19 Aug 2016 22:54:18 +0000 (15:54 -0700)
committerAndre Eisenbach <eisenbach@google.com>
Fri, 19 Aug 2016 22:54:39 +0000 (15:54 -0700)
Change-Id: I692c5f9e57dd53370377a9d926b905a6c8c2276d


Trivial merge