OSDN Git Service

resolve merge conflicts of 5fa7fb1d9f2a to master
[android-x86/frameworks-base.git] / libs /
2017-01-21 Jesse Hallresolve merge conflicts of 5fa7fb1d9f2a to master
2017-01-20 TreeHugger RobotMerge "Remove call to propagate permissions"
2017-01-20 TreeHugger RobotMerge "Added open, dismiss and split screen as custom...
2017-01-20 Jean-Michel TriviMerge "Notification player: do not use stream types"
2017-01-20 Amin ShaikhMerge "Add additional fields to RecommendationRequest...
2017-01-20 Makoto OnukiMerge "Do not allow work profile apps to access main...
2017-01-20 Amin ShaikhMerge "Add additional fields to RecommendationRequest...
2017-01-20 Amin ShaikhMerge "Add additional fields to RecommendationRequest...
2017-01-20 Rebecca SilbersteinMerge "SystemServer: reorder wifi services start" am...
2017-01-20 Chris PhoenixMerge "TvInput HAL uses "default" service name"
2017-01-20 Rebecca SilbersteinMerge "SystemServer: reorder wifi services start" am...
2017-01-20 Jeff SharkeyMerge "Add Binder support for Parcelable exceptions...
2017-01-20 Sunny GoyalMerge "Fixing dimensions for AppWidgetProviderInfo...
2017-01-20 Rebecca SilbersteinMerge "SystemServer: reorder wifi services start" am...
2017-01-20 Jeff SharkeyMerge "Add Binder support for Parcelable exceptions...
2017-01-20 Jiuyu SunMerge "Change the default behavior when MCC/MNC changes."
2017-01-20 Jeff SharkeyMerge "Add Binder support for Parcelable exceptions...
2017-01-20 Chad BrubakerMerge "Add ephemeral whitelist for SettingsProvider"
2017-01-20 TreeHugger RobotMerge "Expose WifiConfiguration#ephemeral is a SystemApi"
2017-01-20 TreeHugger RobotMerge "Make TelephonyManager#get/setAllowedCarriers...
2017-01-20 TreeHugger RobotMerge "Change KernelUidCpuTimeReader Slog.wtf to Slog.e"
2017-01-20 TreeHugger RobotMerge "Destroy DisplayLists on time"
2017-01-20 Sundeep GhumanMerge "Allow REQUEST_NETWORK_SCORES to be used by Setup...
2017-01-20 Philipp WeißMerge "DO NOT MERGE Finalize device-monitoring dialog...
2017-01-20 phweissDO NOT MERGE Finalize device-monitoring dialog strings...
2017-01-20 Philipp WeißMerge "DO NOT MERGE Finalize device-monitoring dialog...
2017-01-20 phweissDO NOT MERGE Finalize device-monitoring dialog strings
2017-01-20 Ta-wei YenMerge "Add voicemail backup/restore columns" into nyc...
2017-01-20 Ta-wei YenAdd voicemail backup/restore columns am: f48d5ce630
2017-01-20 Ta-wei YenMerge "Add voicemail backup/restore columns" into nyc...
2017-01-20 Ta-wei YenAdd voicemail backup/restore columns
2017-01-20 Ta-wei YenMerge "Add voicemail backup/restore columns" into nyc...
2017-01-20 Fyodor KupolovMerge "[DO NOT MERGE] Do not report boot timings on...
2017-01-20 Fyodor Kupolov[DO NOT MERGE] Do not report boot timings on first...
2017-01-20 Fyodor KupolovMerge "[DO NOT MERGE] Do not report boot timings on...
2017-01-20 Fyodor Kupolov[DO NOT MERGE] Do not report boot timings on first...
2017-01-20 Bartosz FabianowskiMerge "Allow system to retrieve persistent preferred...
2017-01-20 Crystal QinMerge "Add new key purpose Wrap Key to KeyProperties...
2017-01-20 TreeHugger RobotMerge "Visual refresh for QS"
2017-01-20 TreeHugger RobotMerge "Don't set a task description for work lock overlay"
2017-01-20 Jeff SharkeyMerge "StrictMode to detect untagged network traffic."
2017-01-20 TreeHugger RobotMerge "Add additional fields to RecommendationRequest."
2017-01-20 Philipp WeißMerge "Adjust device-monitoring dialog strings"
2017-01-20 TreeHugger RobotMerge "Change default settings theme to light color."
2017-01-20 Michal KarpinskiMerge "Unhide enabling backup service in DO APIs"
2017-01-20 Makoto OnukiMerge "requestPinShortcut for pinned shortcut still...
2017-01-20 TreeHugger RobotMerge "Refactor GLFunctorDrawable to use new SkCanvas...
2017-01-20 Julia ReynoldsMerge "Save deleted channels."
2017-01-20 Jorim JaggiMerge "Persist task snapshots to disk"
2017-01-20 Erik KlineMerge "Refactor to SimChangeListener class" am: a122170...
2017-01-20 Erik KlineMerge "Refactor to SimChangeListener class" am: a122170...
2017-01-20 Erik KlineMerge "Address comments from previous change (320592...
2017-01-20 Erik KlineMerge "Refactor to SimChangeListener class" am: a12217012e
2017-01-20 Erik KlineMerge "Address comments from previous change (320592...
2017-01-20 Erik KlineMerge "Address comments from previous change (320592...
2017-01-20 TreeHugger RobotMerge "ConnectivityServiceTest: some fixes in CallbackInfo"
2017-01-20 Lorenzo ColittiMerge "Don't loop forever on zero-length ICMPv6 ND...
2017-01-20 Lorenzo ColittiMerge "Don't loop forever on zero-length ICMPv6 ND...
2017-01-20 Lorenzo ColittiMerge "Don't loop forever on zero-length ICMPv6 ND...
2017-01-20 Hugo BenichiMerge "DO NOT MERGE Unit tests for NetworkNotificationM...
2017-01-20 Hugo BenichiMerge "DO NOT MERGE Unit tests for NetworkNotificationM...
2017-01-20 Hugo BenichiMerge "DO NOT MERGE Unit tests for NetworkNotificationM...
2017-01-20 Erik KlineMerge "BroadcastReceiver refactoring" am: 73a57bb9da...
2017-01-20 Jiaquan HeMerge "2D Recents: round task thumbnails properly....
2017-01-20 Jiaquan He2D Recents: round task thumbnails properly. am: 90f4f5290b
2017-01-20 Chen XuMerge "Initial change on carrier signal filtering"...
2017-01-20 Erik KlineMerge "BroadcastReceiver refactoring" am: 73a57bb9da...
2017-01-20 Erik KlineMerge "BroadcastReceiver refactoring" am: 73a57bb9da
2017-01-20 TreeHugger RobotMerge "Disable kernel UID updates until update lands."
2017-01-20 Jiaquan HeMerge "2D Recents: round task thumbnails properly....
2017-01-20 Jiaquan He2D Recents: round task thumbnails properly.
2017-01-20 Chen XuMerge "Initial change on carrier signal filtering"...
2017-01-20 TreeHugger RobotMerge "Add wide color gamut and HDR resource qualifiers"
2017-01-20 Colin CrossMerge "Revert "Update layoutlib following Change Id10ca...
2017-01-20 Chen XuMerge "Initial change on carrier signal filtering"...
2017-01-20 TreeHugger RobotMerge "Enable background restrictions"
2017-01-20 Romain GuyAdd wide color gamut and HDR resource qualifiers
2017-01-20 Jeremy JoslinMerge "Check for REQUEST_NETWORK_SCORES instead of...
2017-01-20 Jeremy JoslinMerge "Check for REQUEST_NETWORK_SCORES instead of...
2017-01-20 Chen XuMerge "Initial change on carrier signal filtering"
2017-01-20 Jeremy JoslinMerge "Pass more data through the recommendation reques...
2017-01-20 Jeremy JoslinMerge "Check for REQUEST_NETWORK_SCORES instead of...
2017-01-20 TreeHugger RobotMerge "2D Recents: round task thumbnails properly."
2017-01-20 TreeHugger RobotMerge "Simplify FileUtils.stringToFile()."
2017-01-20 TreeHugger RobotMerge "Insert badged icons into the WifiSettings picker."
2017-01-20 Jeremy JoslinMerge "Pass more data through the recommendation reques...
2017-01-20 TreeHugger RobotMerge "Add rankingScores and badges to WifiPicker."
2017-01-20 Jeremy JoslinMerge "Pass more data through the recommendation reques...
2017-01-20 Siyamed SinirRevert "Follow minikin::FontFamily constructor signatur...
2017-01-20 Android Build Merg... Merge changes from topic 'am-e50edd437cbb475fa514e75055...
2017-01-20 Siyamed SinirMerge "Revert "Introduce set/getFontVariationSettings.""
2017-01-20 TreeHugger RobotMerge "ActivityThread: Only update code paths that...
2017-01-20 Svet GanovMerge "Use separate switch ops for runtime permissions...
2017-01-20 Svet GanovUse separate switch ops for runtime permissions am...
2017-01-20 Svet GanovUse separate switch ops for runtime permissions am...
2017-01-20 Svet GanovUse separate switch ops for runtime permissions am...
2017-01-20 Svet GanovUse separate switch ops for runtime permissions am...
2017-01-20 Svet GanovUse separate switch ops for runtime permissions
2017-01-20 Svet GanovUse separate switch ops for runtime permissions
2017-01-20 Jiaquan He2D Recents: handle keyboard config changes. am: 44db90262e
next