OSDN Git Service

Merge "GCC doesn\'t like {}, and clang doesn\'t like {0}..."
authorElliott Hughes <enh@google.com>
Fri, 26 Feb 2016 05:55:34 +0000 (05:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 26 Feb 2016 05:55:34 +0000 (05:55 +0000)
am: a8e75ba37d

* commit 'a8e75ba37deff962b0ddbc2fb81b96c3515ae7e5':
  GCC doesn't like {}, and clang doesn't like {0}...


Trivial merge