OSDN Git Service

Merge "resolve merge conflicts of 8547681 to nyc-mr1-dev-plus-aosp" into nyc-mr1...
authorAndre Eisenbach <eisenbach@google.com>
Fri, 19 Aug 2016 23:14:50 +0000 (23:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 Aug 2016 23:14:50 +0000 (23:14 +0000)
am: 6007a9e2e0

Change-Id: I44c15e0a2a91657f5822585a9d4803d150dee51b


Trivial merge