tree 662d6e72e35097b4870b3dd13a39c68c930af68c
parent 277bf1ae7967728b5ef915cc60c20ccb722c7cac
parent 519bd730061f8a7305d694f1803cda14d21cea4f
author TreeHugger Robot <treehugger-gerrit@google.com> 1556780613 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1556780613 +0000

Merge "Revert "Temporarily not inheriting updatable_apex.mk"" into qt-dev