OSDN Git Service

resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24
[android-x86/frameworks-base.git] / libs / hwui /
2016-08-24 David Christieresolve merge conflicts of b4a5615 to lmp-dev am: 28816...
2016-08-23 David Christieresolve merge conflicts of 1081a15 to lmp-mr1-ub-dev
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
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-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-07-30 Sungsoo LimMerge \\\"DO NOT MERGE: Fix CTS regression\\\" into...
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-30 Sungsoo LimMerge \"DO NOT MERGE: Fix CTS regression\" into lmp-dev
2016-07-30 Sungsoo LimDO NOT MERGE: Fix CTS regression
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 am: 7a92dc9d99
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
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-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
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-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 am: 863ac471cf
2016-07-01 fionaxuMerge \\\"DO NOT MERGE revert public api loadSafeLabel...
2016-07-01 fionaxuMerge \"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-30 fionaxuDO NOT MERGE revert public api loadSafeLabel am: f44c73...
2016-06-30 fionaxuDO NOT MERGE revert public api loadSafeLabel am: f44c73abb2
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-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 TateDO NOT MERGE: Don\\\'t trust callers to supply app...
2016-06-16 Christopher TateDon\\\'t trust callers to supply app info to bindBackup...
2016-06-16 Christopher TateDO NOT MERGE: Don\\'t trust callers to supply app info...
2016-06-16 Christopher TateDon\'t trust callers to supply app info to bindBackupAg...
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 am...
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-08 fionaxuDO NOT MERGE fix build breakage on k am: 4e33c4f8b1
2016-06-07 fionaxuBackport loadSafeLabel changes am: be2865a60a am: 4c508...
2016-06-07 fionaxuBackport loadSafeLabel changes am: be2865a60a
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-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-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-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: 7c9f2b8aa2
2016-04-20 Christopher Tateresolve merge conflicts of 5e380f0 to lmp-mr1-ub-dev
2016-04-19 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: 60351d3...
2016-04-11 Todd KennedyDO NOT MERGE Fix intent filter priorities am: d6174e7...
2016-04-11 Todd KennedyDO NOT MERGE Fix intent filter priorities am: 60351d3
2016-04-11 Todd KennedyDO NOT MERGE Fix intent filter priorities
2016-03-23 Samuel Tan[DO NOT MERGE] Disallow guest user from changing Wifi...
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-02-20 Shreyas BasargeNPE fix for SyncStorageEngine read authority am: a962d9...
2016-02-20 Shreyas BasargeNPE fix for SyncStorageEngine read authority am: a962d9...
2016-02-20 Shreyas BasargeNPE fix for SyncStorageEngine read authority am: a962d9eba7
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-21 Matthew WilliamsDO NOT MERGE Redact Account info from getCurrentSyncs...
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-20 Matthew WilliamsRedact Account info from getCurrentSyncs am: f39549e389
2016-01-20 Matthew WilliamsRedact Account info from getCurrentSyncs
2016-01-11 Geoff MendalRevert "Import translations. DO NOT MERGE" am: 8874f975...
2016-01-11 Geoff MendalRevert "Import translations. DO NOT MERGE"
next