tree aad15cae64329e42ad3647bf7dec716a1a8a1d0e
parent 882895a610f6a22008172e3f2243c403dc3b46c9
parent 59c917aa028e5377929b0095987e315b3dc44e70
author Tao Bao <tbao@google.com> 1481654392 +0000
committer android-build-merger <android-build-merger@google.com> 1481654392 +0000

Merge "clang-format: Adjust short functions / if settings." am: d6a5005fcb am: 3541850a9a am: 01afbb8f29
am: 59c917aa02

Change-Id: Ie85a2315272e009ad43b29728b080d890348a0b8