OSDN Git Service

am df4492f3: (-s ours) am fad8370c: Merge "Improve .clang-format."
authorJosh Gao <jmgao@google.com>
Thu, 27 Aug 2015 05:06:16 +0000 (05:06 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 05:06:16 +0000 (05:06 +0000)
* commit 'df4492f339662ae1468bce3ee33270142227146c':


Trivial merge