OSDN Git Service

Merge changes I70eafe03,Ia44e16c5
authorHansong Zhang <hsz@google.com>
Wed, 28 Mar 2018 01:20:03 +0000 (01:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 28 Mar 2018 01:20:03 +0000 (01:20 +0000)
am: b52f49153c

Change-Id: I58da92a4ad77166f68a0aaec6f3fcc4ceeefc3f9


Trivial merge