tree caa7dd0704a799664e9b09f53e1bd43e3a3ffde6
parent 582d18c02b706199324b38b449860e281249df4e
parent 60c8cfdd0ff09070ac8d121416a8df90e6c037d7
author Mathew Inwood <mathewi@google.com> 1533164512 -0700
committer android-build-merger <android-build-merger@google.com> 1533164512 -0700

Merge "Code reformatting for upcoming annotations."
am: 60c8cfdd0f

Change-Id: I4fcf520f53dddd6e70edf0d59fd13ae218c336a5