OSDN Git Service

am 12a00ef3: am 4b2e98fc: Merge "Fix C++14 bitrot."
authorDan Albert <danalbert@google.com>
Fri, 7 Aug 2015 23:35:07 +0000 (23:35 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 7 Aug 2015 23:35:07 +0000 (23:35 +0000)
* commit '12a00ef305c8ef5b2f2c8e361dd09de77ff90d09':
  Fix C++14 bitrot.


Trivial merge