Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
b569d8bbf989e08e7c013bf0888cceddc9b939e8
frameworks_base/core/java/android
History
Paul Jensen b569d8bbf9 Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434 am: 42a5983364 am: 75095e6f02 am: 7c625e1938 am: 54a62d5feb am: a5a2c88fb3 am: 7ff57eaff9 am: 94c8855da6 am: 50615e498e am: fdc53e96d3 
am: 257c5b2e9c

* commit '257c5b2e9ce5969e22c88d84213f394953740c64':
  Don't pass URL path and username/password to PAC scripts

Change-Id: If9f1006bd7d4ab2acc3ce3e75a0746f6ca44b01a
2016-05-27 17:42:22 +00:00
..
accessibilityservice
Reduce cost of a11y services with magnification.
2016-05-09 16:21:29 -07:00
accounts
…
animation
Merge "Clamp start delay to non-negative range" into nyc-dev am: 54d89e078d am: 0890a4708e
2016-05-25 01:57:48 +00:00
annotation
…
app
Merge "Use app\'s best locale if they override LocaleList" into nyc-dev am: fbf3a0964a am: fbdf46f663
2016-05-26 02:45:13 +00:00
appwidget
Merge "Maintaining diff for all widget operations instead of just the Views update" into nyc-mr1-dev
2016-05-25 20:45:44 +00:00
bluetooth
Merge "Add missing @Deprecated annotations."
2016-05-25 17:46:40 +00:00
content
Merge "API council feedback: hide and document." into nyc-dev am: dfe232c763 am: 19e2f49181
2016-05-25 21:06:41 +00:00
database
Add missing @Deprecated annotations.
2016-05-24 15:22:55 -07:00
ddm
…
debug
…
gesture
…
hardware
Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev am: c396f0f70e
2016-05-26 14:51:30 +00:00
inputmethodservice
Add missing @Deprecated annotations.
2016-05-24 15:22:55 -07:00
net
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434 am: 42a5983364 am: 75095e6f02 am: 7c625e1938 am: 54a62d5feb am: a5a2c88fb3 am: 7ff57eaff9 am: 94c8855da6 am: 50615e498e am: fdc53e96d3
2016-05-27 17:42:22 +00:00
nfc
Merge "Adddress NFC API review comments." into nyc-dev am: 1fef88d8dc
2016-05-17 18:39:50 +00:00
os
resolve merge conflicts of 58db550 to master
2016-05-27 10:12:55 -06:00
permissionpresenterservice
…
preference
…
print
…
printservice
…
provider
Merge "Fix system locale propagation during user creation." into nyc-dev am: ce9f5e3657 am: b03e7217f3
2016-05-26 04:34:26 +00:00
security
Use an attribute for the network security config resource
2016-05-19 17:25:41 -07:00
service
Merge "Rename carrier messaging API constant." into nyc-dev am: f7375b46ff am: e6c6ca417d
2016-05-26 16:31:58 +00:00
speech
…
test
…
text
Add missing @Deprecated annotations.
2016-05-24 15:22:55 -07:00
transition
Merge "Add missing @Deprecated annotations."
2016-05-25 17:46:40 +00:00
util
stephenli@ manually merge many commits up to '032dcff'
2016-05-19 23:51:32 +00:00
view
Merge "Merge "Update the light center when the root view\'s layout changed" into nyc-dev am: e78ba24c17 am: 56d4dae9ec" into nyc-mr1-dev-plus-aosp
2016-05-27 17:24:49 +00:00
webkit
Add missing @Deprecated annotations.
2016-05-24 15:22:55 -07:00
widget
Merge "Fix TextView layout reuse when maxLines is set" into nyc-dev am: e747160509 am: baf8284c62
2016-05-25 22:25:50 +00:00
package.html
…