tree 86e611178b3ff66f57929100063e61b46cbf6b26
parent 4a2dae0d2cfa3a73d7d8a1f8a222dd90a116d707
parent 1c29b5b739ef6a27a32dfd7094e39c6a134f4c5c
author Rahul Sabnis <rahulsabnis@google.com> 1569632997 -0700
committer android-build-merger <android-build-merger@google.com> 1569632997 -0700

[automerger skipped] Merge "Use memcpy instead of casting to convert device_class to int" into pi-dev am: 6b65899e9d -s ours am: 87a627c9cc -s ours
am: 1c29b5b739 -s ours
am skip reason: change_id Iee71ce35576e438317841d41a81fda6a87e1984a with SHA1 3a3ee5c3f9 is in history

Change-Id: I296c7786162b4e7c290e4eefda818b5a866f8e31