tree f864cfd9df12378adf3a13460b4056a2b6f8b85f
parent 68b18273056d47587f33e3e1278c12a86ebcd298
parent af2218bde68f0eefe623bc0967e40bfd0f5b3ad5
author Jack Yu <jackyu@google.com> 1542770017 -0800
committer android-build-merger <android-build-merger@google.com> 1542770017 -0800

[automerger skipped] Merge "Move hidden APIs into system APIs" am: 860d8d0d80 am: c3375240ba
am: af2218bde6  -s ours

Change-Id: I4e5a889457bb67aae101866ca7d88e0fa399bb39