tree 5675775dc748a3689d2f822229beb06034ba3f5f
parent 04c969ef9f5b328ffa0454573a93bbcf7f894854
author Sameer Padala <sxp@google.com> 1406675828 -0700
committer Sameer Padala <sxp@google.com> 1406675828 -0700

Modify code so it compiles on google3

The diamond operator isn't supported on google3 Android projects.

Change-Id: Ie7298b051330bb2cd32426d4c537882faa2f8ebd