tree 8a6367609a4fa87927228b3c82c7099f392b1295
parent 999e7d80df469ede9f11a7625d482de440ab20ce
parent a6e1fadea54fbe20516fc40cbc068c38c4f9f218
author Dan Willemsen <dwillemsen@google.com> 1529609771 -0700
committer android-build-merger <android-build-merger@google.com> 1529609771 -0700

Merge changes from topics "deprecate_export", "add_build_broken" am: 08015aa03b
am: a6e1fadea5

Change-Id: Ia5ecc637bcf2a5c4eb2308f24c3837ef74412b12