Merge "Fix warnings caused by using unnamed enums as template parameters"
authorPyry Haulos <phaulos@google.com>
Fri, 3 Apr 2015 20:28:02 +0000 (20:28 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 3 Apr 2015 20:30:49 +0000 (20:30 +0000)

Trivial merge