tree 5bf6540a3f3a50087cd5190e92707aea13a33c47
parent 0b1738fbd8de07f45bdb58de30c0c547a3fdecbc
parent e21772ed5047dc43cd79259aa3af3eb5dfa0a633
author Anton Hansson <hansson@google.com> 1600852171 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600852171 +0000

Merge "Add genrules for merged current.txt" am: 591327acd4 am: e21772ed50

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1432681

Change-Id: I952efb47b3fb874c38bb805429311cefa37da07e