tree f31948b9ce23f6cce9d3a9450ca3c90b4ac73355
parent fd4e34b1b3a898829f1fedaafbaea001193f2536
parent 8a9d358531e6ec95340d95b0a42ee84310e3701e
author Janis Danisevskis <jdanis@google.com> 1516308741 +0000
committer android-build-merger <android-build-merger@google.com> 1516308741 +0000

Merge upstream for the first time am: 3798baae63
am: 8a9d358531

Change-Id: I4140da4f2effcdd77979049fa6645f93aa7ad47e