Commit 84f838d7 authored by John Stultz's avatar John Stultz
Browse files

Merge remote-tracking branch 'freedesktop/master' into aosp/master 



This merges the freedesktop/master branch into aosp/master

Change-Id: I3104d45924f67d37808154d04c15518394204478
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
parents 2f9aea06 35affe89
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment