tree 04ba3d8bc3f68ddde1e21c4654f8ac04424a77a0
parent b913474201383789dae72f88bd80a2ce69254534
parent b4a4f7e366cb7fea90f058ada71445186ebb3381
author Mathew Inwood <mathewi@google.com> 1534848116 -0700
committer android-build-merger <android-build-merger@google.com> 1534848116 -0700

Merge "Code reformatting for upcoming automated code changes." am: fc38791616
am: b4a4f7e366

Change-Id: I20eff2644e434683441593b4ec173773c2d0e34f