OSDN Git Service

resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e am...
[android-x86/frameworks-base.git] / cmds / svc /
2016-06-08 fionaxuresolve merge conflicts of 2c53526 to lmp-mr1-dev am...
2016-06-08 fionaxuresolve merge conflicts of 2c53526 to lmp-mr1-dev am...
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-26 Paul JensenMerge "Don\'t pass URL path and username/password to...
2016-05-26 Christopher TateDO NOT MERGE : backport of backup transport whitelist...
2016-05-26 Christopher TateDO NOT MERGE : backport of backup transport whitelist...
2016-05-25 Christopher TateMerge "Backport of backup transport whitelist" into...
2016-05-24 Jim MillerMerge "Fix missing permission check when saving pattern...
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-02 Adam PowellBackport ChooserTarget package source check from N
2016-04-20 Christopher Tateresolve merge conflicts of 44e07e0 to mnc-dev
2016-04-20 Christopher Tateresolve merge conflicts of 44e07e0 to mnc-dev
2016-04-18 Michael WrightMerge "Add new, hidden MotionEvent flag for partially...
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: 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-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-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-11 Geoff MendalMerge "Revert "Import translations. DO NOT MERGE""...
2016-01-11 Geoff MendalMerge "Revert "Import translations. DO NOT MERGE""...
2016-01-11 Geoff MendalRevert "Import translations. DO NOT MERGE" am: 8874f975...
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-11 Geoff MendalImport translations. DO NOT MERGE am: 9f9e736e0d ...
2016-01-11 Geoff MendalImport translations. DO NOT MERGE am: a4505e9264 ...
2016-01-11 Geoff MendalImport translations. DO NOT MERGE
2016-01-07 Baligh UddinFix plurals variable to unblock Translations Pipeline...
2016-01-07 Baligh UddinFix plurals variable to unblock Translations Pipeline...
2015-12-18 Robert Greenwaltresolve merge conflicts of 9887f2f50a to lmp-sprout...
2015-12-18 Robert Greenwaltresolve merge conflicts of 9887f2f50a to lmp-sprout...
2015-12-17 Robert GreenwaltMerge "Check permissions on getDeviceId." into mnc-dev
2015-12-16 Adam LesinskiDO NOT MERGE: AAPT: Dump uses-permission-sdk-23
2015-12-05 Eino-Ville TalvalaMerge "Camera: codegen doc update" into mnc-dev
2015-12-03 Andy HungDO NOT MERGE SoundPool: add lock for findSample access...
2015-11-19 Sreeram RamachandranDon\'t use framework permission strings for netd permis...
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...
2015-11-17 Michael WrightDO NOT MERGE. Prevent recents from coming up when in...
2015-11-17 Michael WrightMerge "DO NOT MERGE. Prevent recents from coming up...
2015-11-17 Sanket PadaweMerge "Don\'t allow contact sharing by default for...
2015-11-16 Eino-Ville TalvalaCamera: Minor documentation update
2015-11-13 Winson ChungMerge "DO NOT MERGE Ensure that the device is provision...
2015-11-13 Winson ChungMerge "DO NOT MERGE Ensure that the device is provision...
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-11-13 Matthew WilliamsSync extras bundle comparison can throw NPE am: c0f39c1...
2015-11-13 Shreyas BasargeSync extras bundle comparison can throw NPE am: 2f137b7...
2015-11-12 Eino-Ville TalvalaCamera: Documentation updates
2015-10-24 Dan SandlerDelay hiding the cast icon for 3 seconds. DO NOT MERGE...
2015-10-24 Dan SandlerDelay hiding the cast icon for 3 seconds. DO NOT MERGE...
2015-10-24 Dan SandlerDelay hiding the cast icon for 3 seconds. DO NOT MERGE...
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-10-21 Paul LawrenceMerge "Don't include password on default encryption...
2015-10-16 Wale OgunwaleMerge "Disassociate system windows from apps" into...
2015-10-15 Dianne Hackbornam e34445f1: Merge "Docs only change: update build...
2015-10-15 Adrian Roosam 31f19c44: Merge "Send next alarm\'s show intent...
2015-10-12 Jeff SharkeyMerge "Fix parole scheduling bugs." into mnc-dr-dev
2015-10-12 Jeff SharkeyMerge "Push firewall rules up to ConnectivityService...
2015-10-07 Yin-Chia Yeham a636be6c: Camera: fix wrong FULL feature string
2015-10-06 Adam Lesinskiam 46684d2c: Merge "Add anydpi to the providing-resourc...
2015-10-01 Jianing Weiam 2813b0fa: Camera2: Update video stabilization API...
2015-09-28 Billy Lauam f360bbca: Merge "Bug: 24112165 Update docs for prote...
2015-09-25 Michael LentineMerge "Revert "Dismiss color fade when it is no longer...
2015-09-24 Adrian Roosam 09945c0b: am fe7ceca1: (-s ours) am 9ceec2f0: am...
2015-09-24 Adrian Roosam fe7ceca1: (-s ours) am 9ceec2f0: am f6c75158: am...
2015-09-23 Paul Jensenam 9971167f: am 5ebe8e26: am 4cbfe331: am 773d71e7...
2015-09-23 Paul Jensenam 62bb1897: am 554cecea: (-s ours) am 10a7d744: am...
2015-09-23 Paul Jensenam 5ebe8e26: am 4cbfe331: am 773d71e7: am 962c3a0f...
2015-09-23 Paul Jensenam 554cecea: (-s ours) am 10a7d744: am 96cd7c14: am...
2015-09-23 Michael LentineMerge "Dismiss color fade when it is no longer used...
2015-09-21 Zach Jangam fed28546: am 3e344f3f: (-s ours) am ba80596b: am...
2015-09-21 Zach Jangam 937141cb: am 0cae8381: (-s ours) am b5173241: am...
2015-09-21 Zach Jangam 3e344f3f: (-s ours) am ba80596b: am f8cda089: am...
2015-09-21 Zach Jangam 0cae8381: (-s ours) am b5173241: am e54c195a: am...
2015-09-21 Jeff Sharkeyam e1a6299b: Relax locking when scanning private volumes.
2015-09-19 Justin HarrisonMerge "Add support for setting color transforms" into...
2015-09-18 Adam LesinskiMerge "Fix crash when no power_profile is specified...
2015-09-18 Adam LesinskiMerge "BatteryStats: Better big-little CPU accounting...
2015-09-18 Shishir AgrawalMerge "Allow non-persistent manual network selection...
2015-09-17 Zach Riggleam ad0acf1d: am 9836b64f: am f68b1953: am 683cd049...
2015-09-17 Zach Riggleam 9836b64f: am f68b1953: am 683cd049: resolved conflic...
next