tree 6ee9142e638c6c062b50e689be535dd5cb00f21b
parent 8dc2a5fdfb05be6f5add3ff30eda761ca8d178b3
parent 45a05eb56787ee0db3712fbe1ec9384740b2eb15
author Marco Nelissen <marcone@google.com> 1507669330 +0000
committer android-build-merger <android-build-merger@google.com> 1507669330 +0000

Merge changes from topic "b23270724" into nyc-dev
am: 45a05eb567

Change-Id: Iee4799062b31b85d92fd2a1ca9ca1000839bc7e6