tree e19b22f5c960993e8a66ae97fe2979695ca5cc83
parent 804d99979a268627a2b14f536fa09bca87d46b7a
parent 5d0b80fb10b1ee93e27c6471919a926a2f160071
author Anton Hansson <hansson@google.com> 1600854010 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600854010 +0000

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

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

Change-Id: Ibd97e2110a0c4b168f8b86cf675c6648b2f3abd4