tree ae82f9b9de1aa8db1c2276f4cbe566e6777c17cd
parent 02763a1c3ee13389598bfd00f895845b32cb3a93
parent 5d669f79f2606acd7eb39e65b33167929876324d
author Mathew Inwood <mathewi@google.com> 1533164735 -0700
committer android-build-merger <android-build-merger@google.com> 1533164735 -0700

Merge "Code formatting change for upcoming annotations."
am: 5d669f79f2

Change-Id: Iffd38fbc5ee5cd01d5900afbfee331e005b860c6