tree 43c362a13854a711b7930dd0d92e258ed2a5b2d7
parent ebe8ae9b030870c6126640c9dc8a7d3b48aa44ab
parent 007e2c00c2d6a8b2419da6b8dd8e18432e547b38
author Betty Zhou <bettyzhou@google.com> 1554259385 -0700
committer android-build-merger <android-build-merger@google.com> 1554259385 -0700

Merge "Sync tools-common-prebuilt.jar from git_master." am: 5b8e2b25a6 am: 64dded1a72
am: 007e2c00c2

Change-Id: I3cef98f345691ba72d3fdc169d9c819d6eaa4d7a