tree ffdb0df7c9d90e9431c7d82ae622ea94173fc4e8
parent 514be1cd565e0b706726ffc67cfdee307e0f3af2
parent b06c7cc52e48ae4266b6fdd74cda87134f42261b
author Colin Cross <ccross@android.com> 1507762482 +0000
committer android-build-merger <android-build-merger@google.com> 1507762482 +0000

Merge changes from topic "neven"
am: b06c7cc52e

Change-Id: Id1cf5bc4a52eaedf16678ff15bb1620976537af8