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

am 75bcd737: am 4ddcb758: (-s ours) am 9ef024ec: (-s ours) Reconcile with... 

am 75bcd737: am 4ddcb758: (-s ours) am 9ef024ec: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '75bcd737':
parents 6426bd62 75bcd737
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