OSDN Git Service

Merge changes from topic "bug73953366_bug74605221" into pi-dev
authorEmilian Peev <epeev@google.com>
Fri, 23 Mar 2018 18:20:08 +0000 (18:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Mar 2018 18:20:08 +0000 (18:20 +0000)
am: 7ed5fb3e1d

Change-Id: I5d435b2c2edfeaaca0e12f1af222680f71dad2fc


Trivial merge