tree d60783f9cd6e95c69bf0e1898b9146a73f087be8
parent 9794690d626762c3b1e683b4771ad66f6c008119
parent ab13512c3121cf846f0c1c7f7b77041b8b92c7ef
author Elliott Hughes <enh@google.com> 1527829406 -0700
committer android-build-merger <android-build-merger@google.com> 1527829406 -0700

Merge "Update to 7.60.0 - May 15 2018."
am: ab13512c31

Change-Id: Idf23b6cb1b4e98028b3fd5d9d5a3ca5c311d3809