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

am d57e7700: (-s ours) am e75a8757: (-s ours) Reconcile with jb-mr1-release - do not merge 

* commit 'd57e7700':
parents 0433d84b d57e7700
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