OSDN Git Service

resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24
[android-x86/frameworks-base.git] / tests / Camera2Tests /
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-11 David Christieresolve merge conflicts of b4a5615 to lmp-dev
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-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-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 am: 863ac471cf
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-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 bindBackup...
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-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 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-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...
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 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-23 Dan SandlerDelay hiding the cast icon for 3 seconds. DO NOT MERGE...
2015-09-24 Adrian Roosam 9ceec2f0: am f6c75158: am 12c54dfa: am c9f7abe3...
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 ba80596b: am f8cda089: am b2b3cecb: am 7b5bf993...
2015-09-21 Zach Jangam b5173241: am e54c195a: am 0a8197b1: am 1cf21e44...
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 11317e82: am 32a420ea: Merge "Revert "Revert "[DO...
2015-09-16 Zach Jangam 00db0826: am 203b4354: Merge "Revert "[DO NOT MERGE...
2015-09-01 Deepanshu Guptaam dd21212f: am eb26f5ce: LayoutLib: Fix typedArray...
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-26 Deepanshu Guptaam 42994097: am a1be8b43: LayoutLib: Update golden...
2015-08-26 Deepanshu Guptaam 2b99b5da: am c9862b44: An ugly hack to render Calend...
2015-08-26 Deepanshu Guptaam 7eb81868: am b1ad4a15: LayoutLib: Fix true transpare...
2015-08-26 Deepanshu Guptaam 9d6e87b6: am da687918: Make getInt in BridgeTypedArr...
2015-08-26 Deepanshu Guptaam c43506fc: am 8c674fda: Fix layout mirroring. [DO...
2015-08-26 Deepanshu Guptaam 918e62f1: am 7aa36129: Fix typo: s/FullScreen/Fullsc...
2015-08-26 Deepanshu Guptaam eb15670c: am 92f373fe: Fix Matrix_Delegate.native_ge...
2015-08-26 Deepanshu Guptaam 42e53ecb: am 66d91401: Revert to using AppTheme...
2015-08-26 Deepanshu Guptaam 5078ad32: am 6b1b651f: Fix imports. [DO NOT MERGE]
2015-08-26 Deepanshu Guptaam 4a213763: am 5ad4dae1: Fix theme namespace in tests...
2015-08-26 Deepanshu Guptaam f988761c: am 723e136f: Run setup for full tests...
2015-08-26 Deepanshu Guptaam e54dbc4a: am 3ba16c1d: LayoutLib: fix layout when...
2015-08-26 Deepanshu Guptaam 147c0506: am 55a36337: LayoutLib: Fix Status/Navigat...
2015-08-26 Deepanshu Guptaam e093bbf3: am d861fd81: Set support flag for custom...
2015-08-26 Deepanshu Guptaam 8a50ecea: am 82fae621: LayoutLib: translucent sys...
2015-08-26 Deepanshu Guptaam d4be80d9: am 9068539a: Update nav bar icons. [DO...
2015-08-26 Deepanshu Guptaam d1dde055: am e5afc311: Move the layout code out...
2015-08-26 Deepanshu Guptaam 87f5fd6b: am c989950d: CalendarView rendering: use...
2015-08-26 Deepanshu Guptaam e3eecca9: am b2fdaca9: Add tools:openDrawer to open...
2015-08-26 Deepanshu Guptaam b4060700: am a14ec6f4: Change tools:list_item to...
2015-08-26 Deepanshu Guptaam 8bfc5a9d: am b1e21330: Implement tools:list_item...
2015-08-26 Jens Ole Lauridsenam 67b73b60: am cd4d5b3f: Support AppBar from Material...
2015-08-26 Deepanshu Guptaam 6f5709ca: am de13095d: Update tests per new layoutli...
2015-08-26 Deepanshu Guptaam 9a13b1e7: am db67caa6: Add missing resolveResValue...
2015-08-26 Deepanshu Guptaam ad16968d: am 6eef1246: LayoutLib: Skip classes from...
next