diff options
| author | Primiano Tucci <primiano@google.com> | 2014-09-30 14:46:33 +0100 |
|---|---|---|
| committer | Primiano Tucci <primiano@google.com> | 2014-09-30 14:46:33 +0100 |
| commit | da0509e3087cc5ee9adc0fe1abb85112ea6529a5 (patch) | |
| tree | 532416c2f3025131e902ab655f3d404945485a6b /p2p/base/rawtransport.cc | |
| parent | 67bbc8e3efef31646fec91b0b422a78708a3f4aa (diff) | |
| parent | 6fd722a3e5cdf933ad206ec7cd697ce95a5630cd (diff) | |
| download | talk-da0509e3087cc5ee9adc0fe1abb85112ea6529a5.tar.gz | |
Merge from Chromium at DEPS revision 267aeeb8d85candroid-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1lollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-release
This commit was generated by merge_to_master.py.
Change-Id: I3cccc8f04ad0036aecdb7eefe316a059ebcefaf9
Diffstat (limited to 'p2p/base/rawtransport.cc')
| -rw-r--r-- | p2p/base/rawtransport.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/p2p/base/rawtransport.cc b/p2p/base/rawtransport.cc index 5913177..2af1864 100644 --- a/p2p/base/rawtransport.cc +++ b/p2p/base/rawtransport.cc @@ -32,8 +32,8 @@ #include "talk/p2p/base/rawtransport.h" #include "talk/p2p/base/rawtransportchannel.h" #include "talk/p2p/base/sessionmanager.h" -#include "talk/xmllite/qname.h" -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/qname.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "webrtc/base/common.h" |