OSDN Git Service

Merge changes I67dbf04a,I032f6741
authorAndreas Gampe <agampe@google.com>
Mon, 26 Feb 2018 22:01:25 +0000 (22:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 26 Feb 2018 22:01:25 +0000 (22:01 +0000)
am: 727ec42d8d

Change-Id: I4c8ce0fa68ae3fbf2a3e835d165a766b6e6aad5c


Trivial merge