OSDN Git Service

Merge changes I3b16caad,Iaf5ea7ab,I09a94042,I69a39039,I35300309, ...
authorChalard Jean <jchalard@google.com>
Wed, 24 Jan 2018 06:03:41 +0000 (06:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 24 Jan 2018 06:03:41 +0000 (06:03 +0000)
am: 6568170b32

Change-Id: I49269ac65138be59d68561ea1c15ff2ad0339d8b


Trivial merge