OSDN Git Service

Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into nyc-dev
authorLajos Molnar <lajos@google.com>
Tue, 15 Aug 2017 00:12:21 +0000 (00:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 15 Aug 2017 00:12:21 +0000 (00:12 +0000)
am: d047df653e

Change-Id: I7a06de14727acb572aaabe16e6807a5a0b8ea3f7


Trivial merge