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

am ff3ead50: (-s ours) am e3b05d09: Merge "Tweaks for forward-compatibility" 

* commit 'ff3ead5072721bfb24202ff9b041cc4291f34e21':
  Tweaks for forward-compatibility
parents e2fc756f 75e3e493
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