OSDN Git Service

Merge changes I85f365f5,I2b3c82fb,I4f196054,I9343237c,I53e4444f, ... am: 84155ed95f...
authorElliott Hughes <enh@google.com>
Tue, 4 Apr 2017 20:20:52 +0000 (20:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 4 Apr 2017 20:20:52 +0000 (20:20 +0000)
am: aa3c936e37

Change-Id: I78b5a5369828511e3474cb76e05c854ba0b6a40c


Trivial merge