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

am e75a8757: Reconcile with jb-mr1-release - do not merge 

* commit 'e75a8757':
parents 094c1a56 e75a8757
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