tree 3e551a04880180ef2c1066bf329171a4fe3b569c
parent b876cb2c145f5c15feb403bfcf4e1260699d6553
parent 68dba96bb465edf01f1687af64a145798673ed9a
author Rahul Sabnis <rahulsabnis@google.com> 1569632996 -0700
committer android-build-merger <android-build-merger@google.com> 1569632996 -0700

[automerger skipped] Merge "Use memcpy instead of casting to convert device_class to int" into oc-dev am: 8e28f45804 am: c68e67fe23 -s ours
am: 68dba96bb4 -s ours
am skip reason: change_id Iee71ce35576e438317841d41a81fda6a87e1984a with SHA1 acf6084291 is in history

Change-Id: Ia3d8616b3d0cbb86e9ddbe0f0154594a58f0914f