Commit b1d73762 authored by Martin Brabham's avatar Martin Brabham Committed by android-build-merger
Browse files

[automerger skipped] Merge "JustWorks: Auto-accept only incoming temporary... 

[automerger skipped] Merge "JustWorks: Auto-accept only incoming temporary pairing." into pi-dev am: 6c603ced -s ours am: 9665fdd5 -s ours
am: d9633df8 -s ours
am skip reason: change_id I4e3f39bc08e9d9493734a21ea29d76e43aeb50c8 with SHA1 a73dfccf is in history

Change-Id: I7684184f8ea9d2a038242c6c9f631c248eb34f64
parents b9385bd5 d9633df8
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