1675a649fd7a8b3cb80ffddae2dc181f122353c5 |
22-Oct-2014 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision 39.0.2171.37 This commit was generated by merge_to_master.py. Change-Id: I4ca18a1d6d089e98b0511ad83f49e89d62401760
rg/chromium/media/MediaCodecBridge.java
rg/chromium/media/MediaPlayerListener.java
|
1320f92c476a1ad9d19dba2a48c72b75566198e9 |
30-Sep-2014 |
Primiano Tucci <primiano@google.com> |
Merge from Chromium at DEPS revision 267aeeb8d85c This commit was generated by merge_to_master.py. Change-Id: Id3aac9713b301fae64408cdaee0888724eeb7c0e
rg/chromium/media/AudioManagerAndroid.java
rg/chromium/media/MediaCodecBridge.java
rg/chromium/media/MediaDrmBridge.java
rg/chromium/media/UsbMidiDeviceAndroid.java
rg/chromium/media/UsbMidiDeviceFactoryAndroid.java
rg/chromium/media/VideoCapture.java
rg/chromium/media/VideoCaptureAndroid.java
rg/chromium/media/VideoCaptureFactory.java
rg/chromium/media/VideoCaptureTango.java
rg/chromium/media/WebAudioMediaCodecBridge.java
|
6e8cce623b6e4fe0c9e4af605d675dd9d0338c38 |
19-Aug-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 290040 This commit was generated by merge_to_master.py. Change-Id: I694ec52d1e0b553f163c2faf4373d63270ab1aac
rg/chromium/media/MediaPlayerBridge.java
rg/chromium/media/VideoCaptureAndroid.java
rg/chromium/media/VideoCaptureFactory.java
rg/chromium/media/VideoCaptureTango.java
|
5f1c94371a64b3196d4be9466099bb892df9b88e |
12-Aug-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 288042 This commit was generated by merge_to_master.py. Change-Id: I583602ff16d735199f1810565c9296e970ce2854
rg/chromium/media/AudioManagerAndroid.java
rg/chromium/media/MediaPlayerBridge.java
rg/chromium/media/VideoCapture.java
|
116680a4aac90f2aa7413d9095a592090648e557 |
21-Jul-2014 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision 284076 This commit was generated by merge_to_master.py. Change-Id: I9a279485b02fe7ceddcd32d992a714ff132e99ae
rg/chromium/media/VideoCaptureAndroid.java
|
3a3813145f1a83bf03a1c0ba55c41393f7e25ba8 |
26-Jun-2014 |
Jeff Tinker <jtinker@google.com> |
Fix build break on mirror-aosp-master Handle ResourceBusyException generically, as is being done upstream, so the addition doesn't break mirror-aosp-master. bug: 13792521 Change-Id: I0ee09f7e1274503bff8a3b17cdea0baf700c9343
rg/chromium/media/MediaDrmBridge.java
|
489e969ea8162ab3b591496185c5bb30a2d41831 |
25-Jun-2014 |
Jeff Tinker <jtinker@google.com> |
Merge "Handle ResourceBusyException from MediaDrm.openSession"
|
6d86b77056ed63eb6871182f42a9fd5f07550f90 |
25-Jun-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 278856 This commit was generated by merge_to_master.py. Change-Id: If3807744d3e5d3ee84b897bd2d099a2b7ed2e7a3
rg/chromium/media/AudioManagerAndroid.java
rg/chromium/media/MediaDrmBridge.java
|
ff5cc0c2da010845caeb2b88b0b294c6ccfc2c2d |
23-Jun-2014 |
Jeff Tinker <jtinker@google.com> |
Handle ResourceBusyException from MediaDrm.openSession bug: 13792521 Change-Id: I123083f60b1af3b7030978bb3ca50b73b4a71daa
rg/chromium/media/MediaDrmBridge.java
|
f8ee788a64d60abd8f2d742a5fdedde054ecd910 |
20-Jun-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 278205 This commit was generated by merge_to_master.py. Change-Id: I23f1e7ea8c154ba72e7fb594436216f861f868ab
rg/chromium/media/AudioManagerAndroid.java
rg/chromium/media/MediaCodecBridge.java
|
cedac228d2dd51db4b79ea1e72c7f249408ee061 |
03-Jun-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 273901 This commit was generated by merge_to_master.py. Change-Id: I45745444894df927ffc1045ab8de88b9e52636a3
rg/chromium/media/MediaPlayerBridge.java
rg/chromium/media/UsbMidiDeviceAndroid.java
|
010d83a9304c5a91596085d917d248abff47903a |
14-May-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 269336 This commit was generated by merge_to_master.py. Change-Id: I8b9c77f10eccd2a8b4c7ce373ffda18568af54ff
rg/chromium/media/MediaDrmBridge.java
rg/chromium/media/MediaPlayerListener.java
rg/chromium/media/UsbMidiDeviceAndroid.java
rg/chromium/media/VideoCaptureFactory.java
|
0529e5d033099cbfc42635f6f6183833b09dff6e |
24-Apr-2014 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision 265802 This commit was generated by merge_to_master.py. Change-Id: I6fac2dbbce472b18ca943b6e6f247835b0bd6281
rg/chromium/media/MediaCodecBridge.java
|
c5cede9ae108bb15f6b7a8aea21c7e1fefa2834c |
10-Apr-2014 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision 262940 This commit was generated by merge_to_master.py. Change-Id: I9a3fddbb29857fa8f68a18c6a0115862b65f84d1
rg/chromium/media/MediaCodecBridge.java
rg/chromium/media/MediaDrmBridge.java
|
e5d81f57cb97b3b6b7fccc9c5610d21eb81db09d |
03-Apr-2014 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision 261286 This commit was generated by merge_to_master.py. Change-Id: Iea9643ce91618057f128e9a5b62c07be152f2b89
rg/chromium/media/VideoCapture.java
rg/chromium/media/VideoCaptureAndroid.java
rg/chromium/media/VideoCaptureFactory.java
rg/chromium/media/VideoCaptureTango.java
|
effb81e5f8246d0db0270817048dc992db66e9fb |
31-Mar-2014 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision 260458 This commit was generated by merge_to_master.py. Change-Id: I140fa91b7f09c8efba4424e99ccb87b94a11d022
rg/chromium/media/MediaCodecBridge.java
rg/chromium/media/UsbMidiDeviceAndroid.java
|
a1401311d1ab56c4ed0a474bd38c108f75cb0cd9 |
18-Mar-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 257591 This commit was generated by merge_to_master.py. Change-Id: I0010df2ec3fbb5d4947cd026de2feb150ce7a6b5
rg/chromium/media/AudioManagerAndroid.java
rg/chromium/media/MediaDrmBridge.java
rg/chromium/media/UsbMidiDeviceAndroid.java
rg/chromium/media/VideoCapture.java
|
5d1f7b1de12d16ceb2c938c56701a3e8bfa558f7 |
21-Feb-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 251904 This commit was generated by merge_to_master.py. Change-Id: I1f9543259d7d2a57d81aa41a1b84f85837439d21
rg/chromium/media/AudioManagerAndroid.java
rg/chromium/media/AudioRecordInput.java
rg/chromium/media/MediaCodecBridge.java
rg/chromium/media/MediaDrmBridge.java
rg/chromium/media/MediaPlayerBridge.java
rg/chromium/media/UsbMidiDeviceAndroid.java
rg/chromium/media/UsbMidiDeviceFactoryAndroid.java
rg/chromium/media/VideoCapture.java
rg/chromium/media/WebAudioMediaCodecBridge.java
|
a3f6a49ab37290eeeb8db0f41ec0f1cb74a68be7 |
18-Dec-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 240154 This commit was generated by merge_to_master.py. Change-Id: I8f2ba858cf0e7f413dddedc2ae91dc37f7136c2e
rg/chromium/media/AudioManagerAndroid.java
rg/chromium/media/AudioRecordInput.java
rg/chromium/media/MediaCodecBridge.java
rg/chromium/media/MediaDrmBridge.java
rg/chromium/media/MediaPlayerBridge.java
rg/chromium/media/MediaPlayerListener.java
rg/chromium/media/VideoCapture.java
rg/chromium/media/WebAudioMediaCodecBridge.java
|
f2477e01787aa58f445919b809d89e252beef54f |
28-Nov-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 237746 This commit was generated by merge_to_master.py. Change-Id: I8997af4cddfeb09a7c26f7e8e672c712cab461ea
rg/chromium/media/AudioManagerAndroid.java
rg/chromium/media/MediaCodecBridge.java
rg/chromium/media/MediaDrmBridge.java
rg/chromium/media/MediaPlayerBridge.java
rg/chromium/media/MediaPlayerListener.java
rg/chromium/media/VideoCapture.java
rg/chromium/media/WebAudioMediaCodecBridge.java
|
0f1bc08d4cfcc34181b0b5cbf065c40f687bf740 |
06-Nov-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 232870 This commit was generated by merge_to_master.py. Change-Id: I9cd2139013538e8bcd17966e8ff30ca5651d1a3d
rg/chromium/media/MediaDrmBridge.java
rg/chromium/media/MediaPlayerBridge.java
|
1e9bf3e0803691d0a228da41fc608347b6db4340 |
31-Oct-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 232015 This commit was generated by merge_to_master.py. Change-Id: If86767ad396b9e2e1a4c1e9df1427daea29703ef
rg/chromium/media/MediaCodecBridge.java
rg/chromium/media/WebAudioMediaCodecBridge.java
|
8bcbed890bc3ce4d7a057a8f32cab53fa534672e |
22-Oct-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 230120 This commit was generated by merge_to_master.py. Change-Id: I54bc06b7ee8a07092e74ce3b68c6893508349042
rg/chromium/media/MediaPlayerBridge.java
|
4e180b6a0b4720a9b8e9e959a882386f690f08ff |
18-Oct-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 228962 This commit was generated by merge_to_master.py. Change-Id: I23bd7d7766f213fd52f28ae5e1ecc6ae9df905ea
rg/chromium/media/MediaCodecBridge.java
rg/chromium/media/VideoCapture.java
|
68043e1e95eeb07d5cae7aca370b26518b0867d6 |
26-Sep-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 225410 This commit was generated by merge_to_master.py. Change-Id: Ifa1539ca216abb163295ee7a77f81bb67f52e178
rg/chromium/media/MediaDrmBridge.java
|
d0247b1b59f9c528cb6df88b4f2b9afaf80d181e |
19-Sep-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 224184 This commit was generated by merge_to_master.py. Change-Id: Ia3424df5abed9bea642c522b9e2358dceabd8423
rg/chromium/media/ImageFormat.template
rg/chromium/media/MediaCodecBridge.java
rg/chromium/media/MediaDrmBridge.java
rg/chromium/media/VideoCapture.java
|
58537e28ecd584eab876aee8be7156509866d23a |
12-Sep-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 222756 This commit was generated by merge_to_master.py. Change-Id: I40d7f32f195f328f005f230ea80d07092d48040e
rg/chromium/media/MediaCodecBridge.java
rg/chromium/media/MediaDrmBridge.java
|
424c4d7b64af9d0d8fd9624f381f469654d5e3d2 |
30-Aug-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision r220549 This commit was generated by merge_to_master.py. Change-Id: I8fcb82db764ec1eb0294280936c177bd9ba8a9e9
rg/chromium/media/MediaDrmBridge.java
rg/chromium/media/VideoCapture.java
|
3551c9c881056c480085172ff9840cab31610854 |
23-Aug-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision r219274 This commit was generated by merge_to_master.py. Change-Id: Ibb7f41396cadf4071e89153e1913c986d126f65d
rg/chromium/media/AudioManagerAndroid.java
rg/chromium/media/MediaCodecBridge.java
rg/chromium/media/MediaDrmBridge.java
rg/chromium/media/VideoCapture.java
|
ba5b9a6411cb1792fd21f0a078d7a25cd1ceec16 |
12-Aug-2013 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision r216972 This commit was generated by merge_to_master.py. Change-Id: I01cb28d94e3fcf99e3624d75cafa50d929787ddd
rg/chromium/media/WebAudioMediaCodecBridge.java
|
a36e5920737c6adbddd3e43b760e5de8431db6e0 |
05-Aug-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision r215573 This commit was generated by merge_to_master.py. Change-Id: Ib95814f98e5765b459dd32425f9bf9138edf2bca
rg/chromium/media/MediaCodecBridge.java
rg/chromium/media/MediaPlayerBridge.java
rg/chromium/media/VideoCapture.java
|
a3f7b4e666c476898878fa745f637129375cd889 |
24-Jul-2013 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision r213371 This commit was generated by merge_to_master.py. Change-Id: I35a74205de4bff52a2dd6b15330f8a002a39efaf
rg/chromium/media/MediaPlayerBridge.java
rg/chromium/media/MediaPlayerListener.java
|
ca12bfac764ba476d6cd062bf1dde12cc64c3f40 |
23-Jul-2013 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision r213057 This commit was generated by merge_to_master.py. Change-Id: I3e2e2506eb9b0080157e9c5f133559df3e600388
rg/chromium/media/MediaCodecBridge.java
|
9ab5563a3196760eb381d102cbb2bc0f7abc6a50 |
18-Jul-2013 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision r212225 This commit was generated by merge_to_master.py. Change-Id: I9b658b6bade7aff6166611a04fb26f4bcf0ca77c
rg/chromium/media/AudioManagerAndroid.java
rg/chromium/media/VideoCapture.java
|
7dbb3d5cf0c15f500944d211057644d6a2f37371 |
17-Jul-2013 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision r212014 This commit was generated by merge_to_master.py. Change-Id: Ie0f261e9682cd8abea1eea1e51beab83d5eea21a
rg/chromium/media/MediaPlayerBridge.java
rg/chromium/media/MediaPlayerListener.java
|
eb525c5499e34cc9c4b825d6d9e75bb07cc06ace |
10-Jul-2013 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision r210036 This commit was generated by merge_to_master.py. Change-Id: Ib0e33a83ad5dfa541481e83d7acfc6970e68f471
rg/chromium/media/AudioManagerAndroid.java
rg/chromium/media/MediaCodecBridge.java
|
7d4cd473f85ac64c3747c96c277f9e506a0d2246 |
19-Jun-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision r207203 This commit was generated by merge_to_master.py. Change-Id: I5fbb6854d092096c4d39edc2865a48be1b53c418
rg/chromium/media/MediaCodecBridge.java
|
868fa2fe829687343ffae624259930155e16dbd8 |
11-Jun-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision r205460 This commit was generated by merge_to_master.py. Change-Id: I4a744a5e426bd3bb378d887cfa56fe054742a540
rg/chromium/media/MediaCodecBridge.java
rg/chromium/media/MediaPlayerListener.java
rg/chromium/media/WebAudioMediaCodecBridge.java
|
90dce4d38c5ff5333bea97d859d4e484e27edf0c |
29-May-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision r202854 This commit was generated by merge_to_master.py. Change-Id: Idca323f71ef844a9e04f454d4f070b1e398f2deb
rg/chromium/media/AudioManagerAndroid.java
rg/chromium/media/MediaCodecBridge.java
rg/chromium/media/VideoCapture.java
|
c2e0dbddbe15c98d52c4786dac06cb8952a8ae6d |
09-May-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision r198571 This commit was generated by merge_to_master.py. Change-Id: I951118a03836157090561764dd2627f0add8118f
rg/chromium/media/AudioManagerAndroid.java
rg/chromium/media/VideoCapture.java
rg/chromium/media/WebAudioMediaCodecBridge.java
|
2a99a7e74a7f215066514fe81d2bfa6639d9eddd |
28-Mar-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision r190564 This commit was generated by merge_to_master.py. Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170
rg/chromium/media/AudioManagerAndroid.java
rg/chromium/media/MediaPlayerBridge.java
rg/chromium/media/MediaPlayerListener.java
rg/chromium/media/VideoCapture.java
|
5821806d5e7f356e8fa4b058a389a808ea183019 |
14-Nov-2012 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision r167172 This commit was generated by merge_to_master.py. Change-Id: Ib8d56fd5ae39a2d7e8c91dcd76cc6d13f25f2aab
rg/chromium/media/MediaPlayerBridge.java
rg/chromium/media/MediaPlayerListener.java
|