tree ffdb0df7c9d90e9431c7d82ae622ea94173fc4e8
parent 3b4130a0d3075d37efe5f56592ed929926fbe119
parent 0898d8987ec7214861c8b850ffd809f0f982dfc8
author Colin Cross <ccross@android.com> 1507766949 +0000
committer android-build-merger <android-build-merger@google.com> 1507766949 +0000

Merge changes from topic "neven" am: b06c7cc52e am: caf2eef611 am: 221bd13118
am: 0898d8987e

Change-Id: Ib263d44140259477ed1e153c41a67c61d90f1da6