OSDN Git Service

Merge changes from topic 'system-vendor-internal-pick'
authorSteven Moreland <smoreland@google.com>
Thu, 20 Apr 2017 01:48:20 +0000 (01:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 20 Apr 2017 01:48:20 +0000 (01:48 +0000)
am: 0ce4693d8f

Change-Id: Id0e53b2ab17df9adc81ceca8d75c798797c9d96c


Trivial merge