OSDN Git Service

Merge changes from topic "tz_catchup1"
authorNeil Fuller <nfuller@google.com>
Fri, 27 Oct 2017 10:13:15 +0000 (10:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 27 Oct 2017 10:13:15 +0000 (10:13 +0000)
am: 4e0a02ce1f

Change-Id: I629930379afd2e3037bbd460ebc83726a8bb0008


Trivial merge