OSDN Git Service

Merge changes I4c0e7fdd,I9ea3827a
authorPaul Duffin <paulduffin@google.com>
Fri, 12 May 2017 12:51:25 +0000 (12:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 May 2017 12:51:25 +0000 (12:51 +0000)
am: c876eece68

Change-Id: Idf7bfe0bf3d9a770772bd364b9c6d1a9db6d9cdf


Trivial merge