tree e832aebee2231e5889f1350f01f857183b244d27
parent 345863769f13f9af125156fc8f0b573cf72229f6
parent a017cf22583e4a5c911a765446f75f287a10fe06
author Marco Nelissen <marcone@google.com> 1507677450 +0000
committer android-build-merger <android-build-merger@google.com> 1507677450 +0000

Merge "Merge changes from topic "b23270724" into nyc-dev am: 45a05eb567 am: e79b2f044c  -s ours am: 4758facf28 am: db1e02306c am: 32d62af8e0 am: fc64ad47f6 am: cf3b663306 am: 66196b4056" into oc-mr1-dev-plus-aosp
am: a017cf2258

Change-Id: Iaa0bf0bdff9d19441c89f4ebd6644be96ae6c19c