OSDN Git Service

resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am...
[android-x86/frameworks-base.git] / keystore /
2016-08-22 Sudheer Shankaresolve merge conflicts of 270947f to klp-modular-dev...
2016-08-22 Sudheer Shankaresolve merge conflicts of 270947f to klp-modular-dev
2016-08-19 Sudheer ShankaMerge "DO NOT MERGE: Clean up when recycling a pid...
2016-08-19 Amith YamasaniDO NOT MERGE: Clean up when recycling a pid with a...
2016-08-19 Sudheer ShankaMerge "DO NOT MERGE: Clean up when recycling a pid...
2016-08-19 Amith YamasaniDO NOT MERGE: Clean up when recycling a pid with a...
2016-08-18 Narayan KamathMerge "Process: Fix communication with zygote." into...
2016-08-18 Narayan KamathProcess: Fix communication with zygote. am: 8e69dd2284...
2016-08-18 Narayan KamathMerge "Process: Fix communication with zygote." into...
2016-08-18 Narayan KamathProcess: Fix communication with zygote. am: 8e69dd2284...
2016-08-18 Narayan KamathProcess: Fix communication with zygote. am: e29c6493c0
2016-08-12 David ChristieFix vulnerability where large GPS XTRA data can be...
2016-08-12 David Christieresolve merge conflicts of b4a5615 to lmp-dev am: 28816...
2016-08-12 David ChristieFix vulnerability where large GPS XTRA data can be...
2016-08-11 David Christieresolve merge conflicts of b4a5615 to lmp-dev
2016-07-30 Sungsoo LimMerge \\"DO NOT MERGE: Fix CTS regression\\" into lmp...
2016-07-30 Sungsoo LimDO NOT MERGE: Fix CTS regression am: edc9238514 -s...
2016-07-30 Sudheer ShankaMerge \"DO NOT MERGE: Allow apps with CREATE_USERS...
2016-07-30 Sudheer ShankaDO NOT MERGE: Allow apps with CREATE_USERS permission...
2016-07-29 Sungsoo LimDO NOT MERGE: Fix CTS regression am: df17644db7 am...
2016-07-29 Sungsoo LimDO NOT MERGE: Fix CTS regression am: df17644db7 am...
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 am: fdd4f...
2016-07-20 Paul StewartWifiEnterpriseConfiguration: Do not print credentials...
2016-07-20 Paul StewartMerge changes Id25696e4,I939a12a2 into klp-dev am:...
2016-07-20 Paul StewartFix string equality comparison am: 1033c6fdbc am: fdd4f...
2016-07-20 Paul StewartWifiEnterpriseConfiguration: Do not print credentials...
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-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-12 Sudheer ShankaMerge \"DO NOT MERGE: Add pm operation to set user...
2016-07-12 Sudheer ShankaMerge \"DO NOT MERGE: Reduce shell power over user...
2016-07-07 fionaxuDO NOT MERGE revert system api loadSafeLabel
2016-07-01 Chen XuMerge \\"DO NOT MERGE revert public api loadSafeLabel...
2016-06-30 fionaxuDO NOT MERGE revert public api loadSafeLabel am: f44c73...
2016-06-30 fionaxuDO NOT MERGE revert public api loadSafeLabel am: f44c73...
2016-06-21 Sudheer ShankaMerge \\"DO NOT MERGE: Add pm operation to set user...
2016-06-21 Sudheer ShankaMerge \\"DO NOT MERGE: Reduce shell power over user...
2016-06-16 Christopher TateDO NOT MERGE: Don\\\\\'t trust callers to supply app...
2016-06-16 Christopher TateDO NOT MERGE: Don\\\'t trust callers to supply app...
2016-06-16 Christopher TateDon\\'t trust callers to supply app info to bindBackupA...
2016-06-08 fionaxuDO NOT MERGE fix build breakage on k am: 4e33c4f8b1...
2016-06-08 fionaxuresolve merge conflicts of 2c53526 to lmp-mr1-dev
2016-06-08 fionaxuDO NOT MERGE fix build breakage on k am: 4e33c4f8b1...
2016-06-07 fionaxuBackport loadSafeLabel changes am: be2865a60a am: 4c508...
2016-05-26 Paul JensenMerge "Don\'t pass URL path and username/password to...
2016-05-26 Paul JensenMerge "Don\'t pass URL path and username/password to...
2016-05-25 Christopher TateDO NOT MERGE : backport of backup transport whitelist...
2016-05-19 John ReckDO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8...
2016-05-19 John ReckDO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8...
2016-04-20 Christopher Tateresolve merge conflicts of 7641889 to lmp-mr1-dev
2016-04-11 Todd KennedyDO NOT MERGE Fix intent filter priorities am: 60351d3...
2016-04-11 Todd KennedyDO NOT MERGE Fix intent filter priorities am: 60351d3...
2016-04-11 Todd KennedyDO NOT MERGE Fix intent filter priorities am: d6174e7...
2016-03-23 Samuel Tan[DO NOT MERGE] Disallow guest user from changing Wifi...
2016-02-20 Shreyas BasargeNPE fix for SyncStorageEngine read authority am: a962d9...
2016-02-20 Shreyas BasargeNPE fix for SyncStorageEngine read authority am: a962d9...
2016-01-21 Matthew WilliamsDO NOT MERGE Redact Account info from getCurrentSyncs...
2016-01-21 Matthew WilliamsDO NOT MERGE Redact Account info from getCurrentSyncs...
2016-01-20 Matthew WilliamsRedact Account info from getCurrentSyncs am: f39549e389...
2016-01-11 Geoff MendalRevert "Import translations. DO NOT MERGE" am: 8874f975...
2016-01-11 Geoff MendalImport translations. DO NOT MERGE am: 9f9e736e0d ...
2016-01-07 Baligh UddinFix plurals variable to unblock Translations Pipeline...
2015-12-18 Robert Greenwaltresolve merge conflicts of 9887f2f50a to lmp-sprout...
2015-11-19 Sreeram RamachandranDon\'t use framework permission strings for netd permis...
2015-11-17 Michael WrightDO NOT MERGE. Prevent recents from coming up when in SUW
2015-11-13 Winson ChungMerge "DO NOT MERGE Ensure that the device is provision...
2015-11-13 Shreyas BasargeSync extras bundle comparison can throw NPE am: 2f137b7...
2015-11-13 Shreyas BasargeSync extras bundle comparison can throw NPE am: 2f137b7...
2015-11-13 Matthew WilliamsSync extras bundle comparison can throw NPE am: c0f39c1...
2015-10-24 Dan SandlerDelay hiding the cast icon for 3 seconds. DO NOT MERGE...
2015-10-23 Dan SandlerDelay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-09-24 Adrian Roosam f6c75158: am 12c54dfa: am c9f7abe3: Merge "DO NOT...
2015-09-23 Paul Jensenam 773d71e7: am 962c3a0f: am ece4ac21: Merge "Don\...
2015-09-23 Paul Jensenam 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_R...
2015-09-21 Zach Jangam f8cda089: am b2b3cecb: am 7b5bf993: am fe4cbf2b...
2015-09-21 Zach Jangam e54c195a: am 0a8197b1: am 1cf21e44: DO NOT MERGE...
2015-09-17 Zach Riggleam 683cd049: resolved conflicts for 521def98 to lmp...
2015-09-17 Zach Jangam fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO...
2015-09-16 Zach Jangam 32a420ea: Merge "Revert "Revert "[DO NOT MERGE]...
2015-09-16 Zach Jangam 203b4354: Merge "Revert "[DO NOT MERGE] Bump up...
2015-09-01 Deepanshu Guptaam eb26f5ce: LayoutLib: Fix typedArray caching.
2015-08-31 Bart Searsam 199c74ea: Merge "DO NOT MERGE. Truncate and ellipsiz...
2015-08-31 Tao Baoam 82b70db7: [DO NOT MERGE] Bump up the timeout for...
2015-08-26 Deepanshu Guptaam a1be8b43: LayoutLib: Update golden test images....
2015-08-26 Deepanshu Guptaam c9862b44: An ugly hack to render CalendarView. ...
2015-08-26 Deepanshu Guptaam b1ad4a15: LayoutLib: Fix true transparency in status...
2015-08-26 Deepanshu Guptaam da687918: Make getInt in BridgeTypedArray accept...
2015-08-26 Deepanshu Guptaam 8c674fda: Fix layout mirroring. [DO NOT MERGE]
2015-08-26 Deepanshu Guptaam 7aa36129: Fix typo: s/FullScreen/Fullscreen/ in...
2015-08-26 Deepanshu Guptaam 92f373fe: Fix Matrix_Delegate.native_getValues(...
2015-08-26 Deepanshu Guptaam 66d91401: Revert to using AppTheme for LayoutLib...
2015-08-26 Deepanshu Guptaam 6b1b651f: Fix imports. [DO NOT MERGE]
2015-08-26 Deepanshu Guptaam 5ad4dae1: Fix theme namespace in tests. [DO NOT...
2015-08-26 Deepanshu Guptaam 723e136f: Run setup for full tests only once. [DO...
2015-08-26 Deepanshu Guptaam 3ba16c1d: LayoutLib: fix layout when nav bar is...
2015-08-26 Deepanshu Guptaam 55a36337: LayoutLib: Fix Status/Navigation Bar color...
2015-08-26 Deepanshu Guptaam d861fd81: Set support flag for custom layouts for...
next