tree afb057fa5e4976b11470feb8a1f6ebae8aab055c
parent ae4625a9d1d6e2d6db98ba2880290dfc667e2d04
parent de2644264928a6fa85842f728e291c8ec3213b3f
author Jiyong Park <jiyong@google.com> 1573918700 -0800
committer android-build-merger <android-build-merger@google.com> 1573918700 -0800

[automerger skipped] Merge "remove framework_base_subdirs" am: 46397049fe am: 7cd8f399f7
am: de26442649 -s ours
am skip reason: change_id Idfa2aa392ae1da9582e7691a8c06c986baad5088 with SHA1 e53786e864 is in history

Change-Id: Ida2dbab0975cd9af137b4472e03a7287e0fdcff5