OSDN Git Service

Merge "Fix ODR violation"
authorColin Cross <ccross@android.com>
Fri, 26 Aug 2016 18:43:18 +0000 (18:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 26 Aug 2016 18:43:18 +0000 (18:43 +0000)
commitee6c328b6416a53878df9eb955afef8faef0f5dd
tree33503c4e144417f5e8fca39ce6b1115c9b49395c
parent404450d7eba25b2fef1b6e4bd1a7600cb41e6486
parent3e318825748197e728618fedc56a156e2981e78c
Merge "Fix ODR violation"
am: 3e31882574

Change-Id: I86b284de927a0ba8df7f594681edb41a7d613e0d