OSDN Git Service

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

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