tree e2d7107e971b0fda72d15b8b1bb555fec62d1c4d
parent 09197c47e2dc6aff492bd4fd8a9aea844dcc3333
parent d6a5005fcb1f2ea6cfbdcb424497b626aeab7e16
author Tao Bao <tbao@google.com> 1481653310 +0000
committer android-build-merger <android-build-merger@google.com> 1481653310 +0000

Merge "clang-format: Adjust short functions / if settings."
am: d6a5005fcb

Change-Id: I2d8d58e4361207656e883cf21116eef9f35bf521