OSDN Git Service

Merge "Fix proxy tracing and enable tests that now work with tracing."
authorJeff Hao <jeffhao@google.com>
Wed, 6 Aug 2014 19:53:18 +0000 (19:53 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 5 Aug 2014 00:20:48 +0000 (00:20 +0000)
1  2 
build/Android.gtest.mk

Simple merge