tree ce4b230ce9c555879ecec69ebb40f59cf31d863f
parent 923868573eb44d5df5cec79df2d9db8e2463876c
parent 545e0e29a11eee6646d8b0d112c9875b31aa4490
author Dan Albert <danalbert@google.com> 1518201494 +0000
committer android-build-merger <android-build-merger@google.com> 1518201494 +0000

Merge to upstream r324282.
am: 545e0e29a1

Change-Id: I48d929aca8de92cd69fe0bd57d6ba52cf7b71015