Commit 81e5d13a 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-dev am: ca7cd459
am: 92b55154 -s ours
am skip reason: change_id Iee71ce35576e438317841d41a81fda6a87e1984a with SHA1 ecf8f751 is in history

Change-Id: I9fdc5544ebca6f8849ae522890eb5774b5cc914f
parents 88452a2e 92b55154
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