Commit b50e15f5 authored by Rahul Sabnis's avatar Rahul Sabnis Committed by android-build-merger
Browse files

[automerger skipped] Merge "Use memcpy instead of casting to convert... 

[automerger skipped] Merge "Use memcpy instead of casting to convert device_class to int" into oc-mr1-dev am: 88452a2e -s ours
am: cd2d913f -s ours
am skip reason: change_id Iee71ce35576e438317841d41a81fda6a87e1984a with SHA1 50bf4cf1 is in history

Change-Id: Ic1f84b471d78143f521ca4cd13eec0bf7febca28
parents bab739ce cd2d913f
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