tree 425ce572a9b9b9dba7b5d660a6a22a570843f076
parent d5038a59ad4f2c758153a0f72f9ce5a34e84225a
parent 860f72fff515b2e84426eadfcc7f8d0a0d8c315e
author Colin Cross <ccross@android.com> 1475195203 +0000
committer android-build-merger <android-build-merger@google.com> 1475195203 +0000

Merge "Rewrite multicharacter constant using constexpr" am: 991667ba8c am: 3f6292ea81 am: 2ef0bdafc1
am: 860f72fff5

Change-Id: I89f0b62dac94e9617214ff40709e3b6c5954eddd