Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | resolved conflicts for merge of 3ce4f3d0 to master | Elliott Hughes | 2014-04-28 | 1 | -4/+3 |
|\ | |||||
| * | am 685a0a72: am bbd87eb9: Merge "Track libcore.os\' move to android.system." | Elliott Hughes | 2014-04-28 | 1 | -4/+3 |
| |\ | |||||
| | * | Track libcore.os' move to android.system. | Elliott Hughes | 2014-04-28 | 1 | -4/+3 |
* | | | Merge "ImageReader: remove RAW_SENSOR format translation" | Zhijun He | 2014-04-25 | 1 | -7/+1 |
|\ \ \ | |||||
| * | | | ImageReader: remove RAW_SENSOR format translation | Zhijun He | 2014-04-24 | 1 | -7/+1 |
* | | | | am ebd6a2d2: am eded9e3b: am adcf38c9: Merge "Release DrmManagerClient resour... | Marco Nelissen | 2014-04-25 | 1 | -0/+13 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | am eded9e3b: am adcf38c9: Merge "Release DrmManagerClient resources" | Marco Nelissen | 2014-04-25 | 1 | -0/+13 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Merge "Release DrmManagerClient resources" | Marco Nelissen | 2014-04-25 | 1 | -0/+13 |
| | |\ \ | |||||
| | | * | | Release DrmManagerClient resources | Mattias Nilsson | 2014-04-15 | 1 | -0/+13 |
* | | | | | Merge "camera2: Add DNG creator class." | Ruben Brunk | 2014-04-25 | 1 | -0/+254 |
|\ \ \ \ \ | |||||
| * | | | | | camera2: Add DNG creator class. | Ruben Brunk | 2014-04-24 | 1 | -0/+254 |
| | |_|_|/ | |/| | | | |||||
* | | | | | camera2: Fix broken camera metadata test due to key rename | Igor Murashkin | 2014-04-22 | 1 | -1/+1 |
* | | | | | Merge "Remove VideoEditor" | Lajos Molnar | 2014-04-22 | 51 | -33643/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Remove VideoEditor | Lajos Molnar | 2014-04-21 | 51 | -33643/+1 |
* | | | | | | PlayerRecord: remove obsolete accessors | Jean-Michel Trivi | 2014-04-22 | 1 | -12/+0 |
* | | | | | | Merge "MediaFocusControl: priority to playing players for media button" | Jean-Michel Trivi | 2014-04-22 | 2 | -95/+134 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | MediaFocusControl: priority to playing players for media button | Jean-Michel Trivi | 2014-04-22 | 2 | -95/+134 |
* | | | | | | am e618f184: am 72eec7f6: Merge "Allow DRM plugins to be destroyed when relea... | Jeff Tinker | 2014-04-21 | 2 | -2/+10 |
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | | | |||||
| * | | | | am 72eec7f6: Merge "Allow DRM plugins to be destroyed when released" into klp... | Jeff Tinker | 2014-04-21 | 2 | -2/+10 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge "Allow DRM plugins to be destroyed when released" into klp-modular-dev | Jeff Tinker | 2014-04-21 | 2 | -2/+10 |
| | |\ \ \ \ | |||||
| | | * | | | | Allow DRM plugins to be destroyed when released | Jeff Tinker | 2014-04-11 | 2 | -2/+10 |
* | | | | | | | am f82c83a8: am eaabdce0: am ca1f8f6d: am c4367721: MTP: Fix getThumbnail | Mike Lockwood | 2014-04-21 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am eaabdce0: am ca1f8f6d: am c4367721: MTP: Fix getThumbnail | Mike Lockwood | 2014-04-21 | 1 | -0/+1 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | am ca1f8f6d: am c4367721: MTP: Fix getThumbnail | Mike Lockwood | 2014-04-21 | 1 | -0/+1 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | MTP: Fix getThumbnail | Mike Lockwood | 2014-04-21 | 1 | -0/+1 |
* | | | | | | | | am ef059b03: am 3c8bbe24: Check that mRemotePlayer is not null before use | Simon Wilson | 2014-04-17 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | am 3c8bbe24: Check that mRemotePlayer is not null before use | Simon Wilson | 2014-04-17 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Check that mRemotePlayer is not null before use | Simon Wilson | 2014-04-17 | 1 | -3/+3 |
| | | |/ / / / | | |/| | | | | |||||
* | | | | | | | Add RouteProviders to the new Media APIs | RoboErik | 2014-04-17 | 35 | -474/+2547 |
| |_|_|/ / / |/| | | | | | |||||
* | | | | | | Merge "media: don't rely on Java 6 parseInt error on leading '+' sign" | Lajos Molnar | 2014-04-16 | 1 | -18/+19 |
|\ \ \ \ \ \ | |||||
| * | | | | | | media: don't rely on Java 6 parseInt error on leading '+' sign | Lajos Molnar | 2014-04-16 | 1 | -18/+19 |
* | | | | | | | am 24dbfdaa: am 936e87e1: am 5788722d: Merge "frameworks: 64 bit compile issues" | Mark Salyzyn | 2014-04-16 | 2 | -10/+13 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | |||||
| * | | | | | am 936e87e1: am 5788722d: Merge "frameworks: 64 bit compile issues" | Mark Salyzyn | 2014-04-16 | 2 | -10/+13 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | frameworks: 64 bit compile issues | Mark Salyzyn | 2014-04-16 | 2 | -10/+13 |
* | | | | | | am 5c04c4e7: am 6ced3b34: am 0d54e471: Merge "Remove code markers" | Dmitriy Ivanov | 2014-04-15 | 2 | -34/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | am 6ced3b34: am 0d54e471: Merge "Remove code markers" | Dmitriy Ivanov | 2014-04-15 | 2 | -34/+1 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Remove code markers | Dmitriy Ivanov | 2014-04-15 | 2 | -34/+1 |
| | | |_|/ | | |/| | | |||||
* | | | | | Merge "Implement USB Audio across Nexus Devices Fix issues with connecting no... | Paul McLean | 2014-04-11 | 1 | -14/+22 |
|\ \ \ \ \ | |||||
| * | | | | | Implement USB Audio across Nexus Devices | Paul McLean | 2014-04-11 | 1 | -14/+22 |
* | | | | | | Merge "Revert "Revert "Initial implementation of USB Audio output.""" | Paul McLean | 2014-04-11 | 2 | -7/+25 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Revert "Revert "Initial implementation of USB Audio output."" | Paul McLean | 2014-04-09 | 2 | -7/+25 |
* | | | | | | am c2bd3687: am 70bba904: am b093e485: Merge "generateProjectThumbnail can fa... | Elliott Hughes | 2014-04-11 | 1 | -3/+5 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | am 70bba904: am b093e485: Merge "generateProjectThumbnail can fail to close o... | Elliott Hughes | 2014-04-11 | 1 | -3/+5 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Merge "generateProjectThumbnail can fail to close output stream" | Elliott Hughes | 2014-04-11 | 1 | -3/+5 |
| | |\ \ \ \ | |||||
| | | * | | | | generateProjectThumbnail can fail to close output stream | Henrik Baard | 2013-07-11 | 1 | -3/+5 |
| * | | | | | | am 4995d725: Merge "Add signature|system permission to MediaDrm signer APIs" ... | Jeff Tinker | 2014-04-03 | 3 | -42/+37 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | Add signature|system permission to MediaDrm signer APIs | Jeff Tinker | 2014-04-02 | 3 | -42/+37 |
* | | | | | | | MediaFrameworkTest: Fix Camera2 API unit test build breakage | Zhijun He | 2014-04-10 | 2 | -37/+96 |
* | | | | | | | Merge "MediaFocusControl: fix comment" | Jean-Michel Trivi | 2014-04-10 | 1 | -4/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | MediaFocusControl: fix comment | Jean-Michel Trivi | 2014-04-10 | 1 | -4/+2 |