tree e6fdfb8d5d926240b96d7581e3ff2696b65167c8
parent 1b1aea22c0cc5567b5967590cb3f949cc45c3a9a
author Brian Carlstrom <bdc@google.com> 1401214452 -0700
committer Brian Carlstrom <bdc@google.com> 1401215567 -0700

Workaround apparent clang compilation issue

Bug: 15014252

(cherry picked from commit ec80e7e1506e7099210399626b46cb8183534e70)

Change-Id: I159d66764749e41d2a97e0912f796085b4fdb6e1