tree 0981c2574e5684e13e6e96ad89afcb3d4a4cf53c
parent 573c1c6da1c7f7e281157b82a14442c93b4d6aa0
parent 61acd71ffaf0194d44842a622366ef89f4d08113
author Dan Albert <danalbert@google.com> 1494461928 +0000
committer android-build-merger <android-build-merger@google.com> 1494461928 +0000

Merge to upstream r300419.
am: 61acd71ffa

Change-Id: I85275a89b33828a5c4414cfe1327bb601437a3d6