| commit | 939b8c943d0198c81702beec3d7faa152b8a29a7 | [log] [tgz] |
|---|---|---|
| author | stefan@webrtc.org <stefan@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | Thu Jul 24 17:52:20 2014 +0000 |
| committer | stefan@webrtc.org <stefan@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | Thu Jul 24 17:52:20 2014 +0000 |
| tree | 01f2a7da8549c21d8da273bc8d6866c64f60570d | |
| parent | 1b4ed025b291d5d226ee45f1f1211becd39a3560 [diff] |
Merge r6571 and r6572 to the 3.55 branch. BUG=3527 R=wu@webrtc.org Review URL: https://webrtc-codereview.appspot.com/18909004 git-svn-id: http://webrtc.googlecode.com/svn/branches/3.55/webrtc@6775 4adac7df-926f-26a2-2b94-8c16560cd09d