OSDN Git Service

Merge "Revert "Fix proxy tracing and enable tests that now work with tracing.""
authorNicolas Geoffray <ngeoffray@google.com>
Tue, 29 Jul 2014 08:36:21 +0000 (08:36 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 23 Jul 2014 19:30:00 +0000 (19:30 +0000)
commit8df73882c60451e7f789bf9b1f3db2d7dc228640
tree1be3d2c3d4bfa3a0a189d15c98c36926c812e7f1
parent01be6e3c4e4f083842ac9a6f8f9e6c2c937b8a15
parent167cc7c33f7100e3f7acc1594c066daa0122e27a
Merge "Revert "Fix proxy tracing and enable tests that now work with tracing.""
runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
test/Android.run-test.mk