tree f3d6d8aa7cd9c560d8a9d1ebef0047565e232b73
parent 8394218d3faafdc6ac857720a24e4706aee9fca5
parent d92d484537aa7f615972899ad81689419ed30d6f
author Jaewoong Jung <jungjw@google.com> 1553017342 -0700
committer android-build-merger <android-build-merger@google.com> 1553017342 -0700

Merge "Fix LOCAL_MODULE_CLASS." am: 7467a54e29
am: d92d484537

Change-Id: I682a37052b98600dabde9fe6f4e547c7f8a79f2b