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

am a4b20d71: am b8e1033c: (-s ours) am e5412a9a: (-s ours) Reconcile with... 

am a4b20d71: am b8e1033c: (-s ours) am e5412a9a: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'a4b20d71':
parents 940e4c9d a4b20d71
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