Commit 8dd2e4ad authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am 001eb417: Merge from open-source master 

Merge commit '001eb417'

* commit '001eb417':
parents 24feaf6b 001eb417
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