OSDN Git Service

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

Change-Id: I789ba7b09abae510e6045ab5d654b8830227381e


Trivial merge