OSDN Git Service

Merge "Backport of backup transport whitelist" into mnc-dev
[android-x86/frameworks-base.git] / packages / services /
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-04-20 Christopher Tateresolve merge conflicts of 44e07e0 to mnc-dev
2016-04-20 Christopher Tateresolve merge conflicts of 5e380f0 to lmp-mr1-ub-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-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-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 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
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-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-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-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-09-24 Adrian Roosam fe7ceca1: (-s ours) am 9ceec2f0: am f6c75158: am...
2015-09-24 Adrian Roosam 9ceec2f0: am f6c75158: am 12c54dfa: am c9f7abe3...
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 Paul Jensenam 4cbfe331: am 773d71e7: am 962c3a0f: am ece4ac21...
2015-09-23 Paul Jensenam 10a7d744: am 96cd7c14: am 635f8711: am a9e98343...
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 Zach Jangam ba80596b: am f8cda089: am b2b3cecb: am 7b5bf993...
2015-09-21 Zach Jangam b5173241: am e54c195a: am 0a8197b1: am 1cf21e44...
2015-09-17 Zach Riggleam 9836b64f: am f68b1953: am 683cd049: resolved conflic...
2015-09-17 Zach Riggleam f68b1953: am 683cd049: resolved conflicts for 521def...
2015-09-17 Zach Jangam fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO...
2015-09-16 Zach Jangam 63348ae4: (-s ours) am 11317e82: am 32a420ea: Merge...
2015-09-16 Zach Jangam 1b06455e: (-s ours) am 00db0826: am 203b4354: Merge...
2015-09-16 Zach Jangam 11317e82: am 32a420ea: Merge "Revert "Revert "[DO...
2015-09-16 Zach Jangam 00db0826: am 203b4354: Merge "Revert "[DO NOT MERGE...
2015-09-08 Android Git Automergeram 1c88f605: Merge branch \'lmp-mr1-ub-dev\' of https...
2015-09-08 Cheryl Potteram 9e28efe4: docs: change intro and title for contacts...
2015-09-04 Cheryl Potteram 4afcda74: am 79ad6310: Merge "docs: changed referenc...
2015-09-04 Renato Manginiam a8b9a2b7: am 81e0dff0: Minor fix on Auto Desktop...
2015-09-02 Deepanshu Guptaam eb541727: am dd21212f: am eb26f5ce: LayoutLib: Fix...
2015-09-01 Deepanshu Guptaam dd21212f: am eb26f5ce: LayoutLib: Fix typedArray...
2015-08-31 Bart Searsam 74890df7: (-s ours) am 3cb7e91f: am 199c74ea: Merge...
2015-08-31 Tao Baoam 0bafa33f: (-s ours) am 35c1eb9e: am 82b70db7: [DO...
2015-08-31 Bart Searsam 3cb7e91f: am 199c74ea: Merge "DO NOT MERGE. Truncate...
2015-08-31 Tao Baoam 35c1eb9e: am 82b70db7: [DO NOT MERGE] Bump up the...
2015-08-27 Rich Slogaram 9f37bd8a: am 0238bf24: docs: New auto Desktop Head...
2015-08-27 Deepanshu Guptaam ebdedb47: (-s ours) am 42994097: am a1be8b43: Layout...
2015-08-27 Deepanshu Guptaam 68ff174b: (-s ours) am 2b99b5da: am c9862b44: An...
2015-08-27 Deepanshu Guptaam d9600c98: (-s ours) am 7eb81868: am b1ad4a15: Layout...
2015-08-27 Deepanshu Guptaam 5769732e: (-s ours) am 9d6e87b6: am da687918: Make...
2015-08-27 Deepanshu Guptaam 728fc731: (-s ours) am c43506fc: am 8c674fda: Fix...
2015-08-27 Deepanshu Guptaam 37ae8f4e: (-s ours) am 918e62f1: am 7aa36129: Fix...
2015-08-27 Deepanshu Guptaam e4b4b084: (-s ours) am eb15670c: am 92f373fe: Fix...
2015-08-27 Deepanshu Guptaam 05ed2d91: (-s ours) am 42e53ecb: am 66d91401: Revert...
2015-08-27 Deepanshu Guptaam 21f66a6b: (-s ours) am 5078ad32: am 6b1b651f: Fix...
2015-08-27 Deepanshu Guptaam 34f6f597: (-s ours) am 4a213763: am 5ad4dae1: Fix...
2015-08-27 Deepanshu Guptaam 39b4f4cc: (-s ours) am f988761c: am 723e136f: Run...
2015-08-27 Deepanshu Guptaam de8da279: (-s ours) am e54dbc4a: am 3ba16c1d: Layout...
2015-08-27 Deepanshu Guptaam 963cac18: (-s ours) am 147c0506: am 55a36337: Layout...
2015-08-27 Deepanshu Guptaam 76111ecb: (-s ours) am e093bbf3: am d861fd81: Set...
2015-08-27 Deepanshu Guptaam c5bd6146: (-s ours) am 8a50ecea: am 82fae621: Layout...
2015-08-27 Deepanshu Guptaam 6dcfe1e2: (-s ours) am d4be80d9: am 9068539a: Update...
2015-08-27 Deepanshu Guptaam 5eaa09ff: (-s ours) am d1dde055: am e5afc311: Move...
2015-08-27 Deepanshu Guptaam 1f2c15ca: (-s ours) am 87f5fd6b: am c989950d: Calend...
2015-08-27 Deepanshu Guptaam 36e164e0: (-s ours) am e3eecca9: am b2fdaca9: Add...
2015-08-27 Deepanshu Guptaam 13cd7660: (-s ours) am b4060700: am a14ec6f4: Change...
2015-08-27 Deepanshu Guptaam a556d756: (-s ours) am 8bfc5a9d: am b1e21330: Implem...
2015-08-27 Jens Ole Lauridsenam 413d41aa: (-s ours) am 67b73b60: am cd4d5b3f: Suppor...
2015-08-27 Deepanshu Guptaam 7a92c26e: (-s ours) am 6f5709ca: am de13095d: Update...
2015-08-27 Deepanshu Guptaam c5c2ea04: (-s ours) am 9a13b1e7: am db67caa6: Add...
2015-08-27 Deepanshu Guptaam e4acf0ad: (-s ours) am ad16968d: am 6eef1246: Layout...
2015-08-27 Deepanshu Guptaam 7911c8b9: (-s ours) am 15e549a8: am 4f5e6c63: Skip...
2015-08-27 Deepanshu Guptaam 13670bc6: (-s ours) am 669e4969: am 3e875dbb: Fix...
next