OSDN Git Service

Merge "Fix ODR violation" am: 3e31882574
authorColin Cross <ccross@android.com>
Fri, 26 Aug 2016 18:46:16 +0000 (18:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 26 Aug 2016 18:46:16 +0000 (18:46 +0000)
commitc34817138f3120dca544c89b0b1e1cc54f1891bc
tree33503c4e144417f5e8fca39ce6b1115c9b49395c
parentd34a3bd85f456caa7a6cd2c830fbd173f02c10db
parentee6c328b6416a53878df9eb955afef8faef0f5dd
Merge "Fix ODR violation" am: 3e31882574
am: ee6c328b64

Change-Id: I6952c082255a9bf24d58846adfee635ee83614cc