
Merge branch 'master' into voe_rewrites Conflicts: src/voice_engine/main/test/auto_test/standard/after_streaming_fixture.cc Revert "Rewrote network-before-streaming." This reverts commit f1a07b813a90e4feef0a0737ebde9fb15acfd459. Rewrote network-before-streaming. Fixed strange build error. Merge branch 'master' into voe_rewrites Revert "Rewrote network-before-streaming." This reverts commit f1a07b813a90e4feef0a0737ebde9fb15acfd459. Rewrote network-before-streaming. Nit fixes Clarified some comments and method names. Style fixes. Removed tab characters. Merge branch 'master' into voe_rewrites Conflicts: src/voice_engine/main/test/auto_test/voe_standard_test.cc Revert "Rewrote network-before-streaming." This reverts commit f1a07b813a90e4feef0a0737ebde9fb15acfd459. Rewrote network-before-streaming. Rewrote the hold test. Abstracted out resource handling and created a new fixture for starting and stopping playing. Rewrote network-before-streaming. Revert "Rewrote network-before-streaming." This reverts commit f1a07b813a90e4feef0a0737ebde9fb15acfd459. Rewrote network-before-streaming. BUG= TEST= Review URL: http://webrtc-codereview.appspot.com/333007 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1230 4adac7df-926f-26a2-2b94-8c16560cd09d
Description
No description provided
Languages
C++
76%
C
16%
Python
2.3%
Java
2.1%
Objective-C++
1.5%
Other
1.9%