tree 46e0bc14036f6e306b864674909d329da88a83a8
parent c5b6563f3074a3a50a960b231570865b0f91540d
parent ab881b65c3dc58a290662dec5b0729034ac6d03b
author Dongwon Kang <dwkang@google.com> 1555496045 -0700
committer android-build-merger <android-build-merger@google.com> 1555496045 -0700

Merge changes from topic "remove-mp2-from-apex" into qt-dev am: 285481dad4
am: ab881b65c3

Change-Id: Idf87b89b1100b2ddfefa5183378e21638ef1a9d5