OSDN Git Service

resolve merge conflicts of 270947f to klp-modular-dev
[android-x86/frameworks-base.git] / media /
2016-08-19 Sudheer Shankaresolve merge conflicts of 270947f to klp-modular-dev
2016-08-18 Narayan KamathMerge "Process: Fix communication with zygote." into...
2016-08-18 Narayan KamathProcess: Fix communication with zygote. am: 8e69dd2284
2016-08-11 David ChristieMerge "Fix vulnerability where large GPS XTRA data...
2016-08-11 David ChristieFix vulnerability where large GPS XTRA data can be...
2016-08-11 David ChristieFix vulnerability where large GPS XTRA data can be...
2016-08-11 David ChristieMerge "Fix vulnerability where large GPS XTRA data...
2016-07-29 Sungsoo LimDO NOT MERGE: Fix CTS regression am: df17644db7
2016-07-29 Sungsoo LimDO NOT MERGE: Fix CTS regression
2016-07-29 Sungsoo LimDO NOT MERGE: Fix CTS regression
2016-07-20 Paul StewartMerge changes Id25696e4,I939a12a2 into klp-dev am:...
2016-07-20 Paul StewartFix string equality comparison am: 1033c6fdbc
2016-07-20 Paul StewartWifiEnterpriseConfiguration: Do not print credentials...
2016-07-20 Paul StewartFix string equality comparison
2016-07-20 Paul StewartWifiEnterpriseConfiguration: Do not print credentials...
2016-07-19 Paul StewartMerge changes Id25696e4,I939a12a2 into klp-dev
2016-07-19 Sungsoo LimDO NOT MERGE: Remove the use of JHEAD in ExifInterface...
2016-07-19 Sungsoo LimDO NOT MERGE: Remove the use of JHEAD in ExifInterface
2016-07-15 Sungsoo LimDO NOT MERGE: Remove the use of JHEAD in ExifInterface
2016-06-30 fionaxuDO NOT MERGE revert public api loadSafeLabel am: f44c73abb2
2016-06-16 Christopher TateDO NOT MERGE: Don\\'t trust callers to supply app info...
2016-06-08 fionaxuDO NOT MERGE fix build breakage on k am: 4e33c4f8b1
2016-06-07 fionaxuBackport loadSafeLabel changes am: be2865a60a
2016-05-26 Paul JensenMerge "Don\'t pass URL path and username/password to...
2016-05-19 John ReckDO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2
2016-04-11 Todd KennedyDO NOT MERGE Fix intent filter priorities am: 60351d3
2016-02-20 Shreyas BasargeNPE fix for SyncStorageEngine read authority am: a962d9eba7
2016-01-21 Matthew WilliamsDO NOT MERGE Redact Account info from getCurrentSyncs...
2015-11-13 Shreyas BasargeSync extras bundle comparison can throw NPE am: 2f137b7705
2015-09-17 Zach Jangam cff4e09e: am bdf7f358: DO NOT MERGE - Backport of...
2015-08-21 Sebastien Hertzam 9e7a0ddb: am 18089ceb: Allow debugging only for...
2015-07-01 Wale Ogunwaleam c215b2b2: am dc9cfca8: Merge "Prevent system uid...
2015-06-26 Amit Mahajanam eee86342: am 9edf7ad5: DO NOT MERGE Change to add...
2015-06-19 Joe Fernandezam 6f8dab04: Merge "Fixes a typo where parens were...
2015-06-02 Leon Scroggins IIIam 7496e153: am 0d208173: DO NOT MERGE: Ensure that...
2015-05-27 Leon Scroggins IIIam 11297581: am 18d79267: Check that the parcel contain...
2015-04-23 Leon Scroggins IIIam a7501119: am 69b8e962: Make Bitmap_createFromParcel...
2015-01-30 Jon Larimeram 545dd853: am 9a425aa7: am 159aa735: am d4031809...
2015-01-30 Jon Larimeram 159aa735: am d4031809: am 48c95c43: Fix build breaka...
2015-01-30 Jon Larimeram d4031809: am 48c95c43: Fix build breakage in older...
2015-01-30 Jon Larimeram 48c95c43: Fix build breakage in older branches by...
2015-01-29 Jon Larimeram 88add689: am a5ccca24: am 2982d648: am de9a76ed...
2015-01-29 Jon Larimeram a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am...
2015-01-29 Jon Larimeram 2982d648: am de9a76ed: am fc731e6e: Merge "Fix Parce...
2015-01-29 Jon Larimeram 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge...
2015-01-29 Jon Larimeram de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice...
2015-01-29 Jon Larimeram d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore...
2015-01-29 Jon Larimeram 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore...
2015-01-29 Jon Larimeram fc731e6e: Merge "Fix ParceledListSlice to enforce...
2015-01-29 Jon Larimeram 7dd12d76: Merge "DO NOT MERGE Restore calling identi...
2015-01-27 Leon Scroggins IIIam 1dbbc204: am 6106f6a4: am 93522968: am 01287549...
2015-01-27 Leon Scroggins IIIam 93522968: am 01287549: am 9a6143fa: Handle bad ninep...
2015-01-27 Leon Scroggins IIIam 01287549: am 9a6143fa: Handle bad ninepatch data.
2015-01-27 Leon Scroggins IIIam 9a6143fa: Handle bad ninepatch data.
2015-01-16 Ricardo Cerveraam 98f07d90: am 92f6a747: docs: Added info on noHistory...
2015-01-16 Ricardo Cerveraam 92f6a747: docs: Added info on noHistory and onActivi...
2015-01-10 Deepanshu Guptaam 74147527: am 8505c387: Special case AppCompat to...
2014-11-10 Eric Laurentam df878bd3: am ced2f74a: am e8c1a97f: am 3b92fc04...
2014-11-10 Eric Laurentam ced2f74a: am e8c1a97f: am 3b92fc04: am 1c2b0d52...
2014-11-10 Eric Laurentam e8c1a97f: am 3b92fc04: am 1c2b0d52: AudioEffect...
2014-11-10 Eric Laurentam 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new...
2014-11-10 Eric Laurentam 1c2b0d52: AudioEffect JNI: use new max preprocessing...
2014-11-10 Eric LaurentAudioEffect JNI: use new max preprocessing constant
2014-11-06 Ricardo Cerveraam e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case...
2014-11-04 Tom Tayloram 7c570346: am 47419a44: am 192a3904: am 23fb2972...
2014-11-04 Tom Tayloram 192a3904: am 23fb2972: am d7044fe1: am b2e54c1b...
2014-11-04 Tom Tayloram 23fb2972: am d7044fe1: am b2e54c1b: am 75e7fbaa...
2014-11-04 Tom Tayloram d7044fe1: am b2e54c1b: am 75e7fbaa: am 37906e6e...
2014-11-04 Tom Tayloram b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5...
2014-11-04 Tom Tayloram 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7...
2014-11-04 Tom Tayloram 66aa87ae: am 90743d64: am bfb7ffeb: Externally Repor...
2014-11-04 Tom Tayloram 90743d64: am bfb7ffeb: Externally Reported Moderate...
2014-11-04 Tom Tayloram 52449372: am bc57a1f8: Externally Reported Moderate...
2014-11-04 Tom Tayloram bfb7ffeb: Externally Reported Moderate Security...
2014-10-29 kmccormickam 1867f2cf: Merge "Doc update: deliv receipt, rate...
2014-10-24 Luan Nguyenam 049db36a: Merge "docs: fixed typo/grammar issues...
2014-10-24 Joe Fernandezam 0e893eb7: Merge "docs:Added 64-bit image note from...
2014-10-24 Natalie Masseam 1e5bb861: Link and typo fixed
2014-10-16 Scott Roweam ab64919c: Merge "docs: update reference to FragmentR...
2014-10-16 Joe Fernandezam 58c64870: Merge "Typo fixed in sample code" into...
2014-10-15 Ricardo Cerveraam 8a7ba4c6: Merge "docs: Fixing notify link. Bug:...
2014-10-15 Luan Nguyenam 2a364235: Merge "docs: Android Wear Design fixes...
2014-10-15 smain@google.comam 075531ae: add the butterbar for L announce to Previe...
2014-10-15 smain@google.comam d8d20f52: update analytics event tracking calls...
2014-10-14 Ricardo Cervera... am 7668aa27: am aa7bcf14: Merge "Revert "docs: Watermar...
2014-10-14 Ricardo Cervera... am aa7bcf14: Merge "Revert "docs: Watermarked images...
2014-10-10 Rich Slogaram a3287768: Merge "docs:SDK tools 23.0.5 Release Note...
2014-10-10 Eric Gilmoream e77fe607: Docs: adding closing bracket to un-break...
2014-10-09 Joe Fernandezam e15773be: Merge "docs: Android TV publishing require...
2014-10-09 smain@google.comam 770c3c5e: fix unclickable link due to overlay from...
2014-10-08 Quddus Chongam 7f567e4a: docs: Changed date of GMS v6.1 (Manchego...
2014-10-08 Joe Fernandezam bcd1af39: Merge "docs: Wear UI Lib training fixes...
2014-10-08 Rich Slogaram 6af8fc7f: Merge "docs:64 bit image and skd update...
2014-10-07 Quddus Chongam 8730092a: Merge "docs: Added API highlights for...
2014-10-07 Quddus Chongam 6628e602: Merge "Updataed Google Play services Javad...
2014-10-07 Ricardo Cerveraam bd964cad: docs: Removing references to self note...
2014-10-07 Ricardo Cerveraam 3f7b4d8f: Merge "docs: Update Common Intents page...
2014-10-04 Quddus Chongam ba2199fa: Merge "docs: Modified the notice in the...
2014-10-04 Ricardo Cerveraam 2a02b881: Merge "docs: Training class for the Wearab...
2014-10-04 Rich Slogaram 83d5c9bf: docs:change required ADT version to 23.0.2
next