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

am 840d233c: am 800e4320: am 63c34b5e: am 68719a17: (-s ours) Reconcile with...

am 840d233c: am 800e4320: am 63c34b5e: am 68719a17: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '840d233c':
parents 33b5dfb6 840d233c
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment