OSDN Git Service

Merge "fix build"
authorColin Cross <ccross@android.com>
Fri, 14 Feb 2014 00:44:29 +0000 (00:44 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 14 Feb 2014 00:44:30 +0000 (00:44 +0000)
commita9baf8795e5d770a2e0ee7da22781701842932bd
tree6458ac00e2b0e44206e8de8e86dfb1a0e6dd63d5
parent2fbe5018f94f536541c0137be472e58c79890813
parent3a14c875203950d0a92d0f9d39ce293d1baeaafa
Merge "fix build"