Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
2d7e53ca901e3abdc3d5fad3fca2fc183d2ed116
frameworks_base/core/java/android
History
Remi NGUYEN VAN 2d7e53ca90 Merge "Fix framework and NetworkStack classes conflicts" 
am: 3f23efdd13

Change-Id: I8c207040c42a3d02b8383e13a4f839c250788f58
2019-02-15 16:38:52 -08:00
..
accessibilityservice
DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into
2019-02-14 09:48:06 -08:00
accounts
DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into
2019-02-14 09:48:06 -08:00
animation
DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into
2019-02-14 09:48:06 -08:00
annotation
Merge "Improve @UnsupportedAppUsage docs."
2018-12-11 11:19:23 +00:00
app
Merge "Move NetworkStack to services.net"
2019-02-15 03:01:11 -08:00
appwidget
DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master
2018-12-11 14:13:44 -08:00
bluetooth
DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into
2019-02-14 09:48:06 -08:00
companion
…
content
Merge "Move NetworkStack to services.net"
2019-02-15 03:01:11 -08:00
database
DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into
2019-02-14 09:48:06 -08:00
ddm
Move CLIENT_PROTOCOL_VERSION to point of use
2019-02-04 17:09:31 +00:00
debug
…
gesture
…
hardware
DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into
2019-02-14 09:48:06 -08:00
inputmethodservice
DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into
2019-02-14 09:48:06 -08:00
metrics
…
net
Merge "Fix framework and NetworkStack classes conflicts"
2019-02-15 16:38:52 -08:00
nfc
DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into
2019-02-14 09:48:06 -08:00
os
Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master" into stage-aosp-master
2019-02-14 22:11:32 +00:00
permissionpresenterservice
…
preference
DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master
2018-12-11 14:13:44 -08:00
print
…
printservice
…
privacy
…
provider
DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into
2019-02-14 09:48:06 -08:00
se/omapi
…
security
Multi-threaded keystore
2018-11-14 09:59:16 -08:00
service
Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master" into stage-aosp-master
2019-02-14 22:11:32 +00:00
speech
…
text
DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into
2019-02-14 09:48:06 -08:00
transition
Add @UnsupportedAppUsage annotations
2018-08-30 13:38:01 +01:00
util
DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into
2019-02-14 09:48:06 -08:00
view
DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into
2019-02-14 09:48:06 -08:00
webkit
DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into
2019-02-14 09:48:06 -08:00
widget
DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into
2019-02-14 09:48:06 -08:00
package.html
…