Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
d10e384d6cd51bf2e15b378a6ab80fa24df476ee
frameworks_base/core/java/android
History
Andrew Solovay d10e384d6c resolve merge conflicts of a3e34fe9fe to pi-dev-plus-aosp 
Bug: None
Test: Eyeballed (comment-only change).
Change-Id: Ia644cde66376b2bddeb27bb2a147b3266037aa2c
Exempt-From-Owner-Approval: Docs-only change
Merged-In: Ia06e1fffd814671289a1caebd5962aedc18a28d7
2018-10-04 22:50:39 +00:00
..
accessibilityservice
docs: fixed instances of typo in 'overridden'
2018-09-13 14:57:25 -07:00
accounts
Merge "docs: fixing typo, bug 37006473" into pi-dev
2018-10-02 17:18:00 -07:00
animation
Merge "Add @UnsupportedAppUsage annotations" am: 058b566f90
2018-08-03 04:29:45 -07:00
annotation
Merge "Add <p> to UnsupportedAppUsage javadoc."
2018-08-28 15:30:29 +00:00
app
resolve merge conflicts of a3e34fe9fe to pi-dev-plus-aosp
2018-10-04 22:50:39 +00:00
appwidget
Merge "Framework: Remove a nonsensical substring(0)" am: 98627fa455
2018-09-11 10:34:11 -07:00
bluetooth
resolve merge conflicts of a3e34fe9fe to pi-dev-plus-aosp
2018-10-04 22:50:39 +00:00
companion
Add @UnsupportedAppUsage annotations
2018-08-09 15:35:32 +01:00
content
Merge "Keep app in high memory adjust if moving from TOP to FGS" into pi-dev
2018-09-27 18:11:46 -07:00
database
Merge "docs: fix bug 37054309, becuase typo" into pi-dev
2018-09-27 13:24:29 -07:00
ddm
Add @UnsupportedAppUsage annotations
2018-08-01 15:35:51 +01:00
debug
…
gesture
…
hardware
Merge "docs: bug 72929620, nonoteslas typo" into pi-dev
2018-10-01 11:58:15 -07:00
inputmethodservice
resolve merge conflicts of a3e34fe9fe to pi-dev-plus-aosp
2018-10-04 22:50:39 +00:00
metrics
…
net
resolve merge conflicts of a3e34fe9fe to pi-dev-plus-aosp
2018-10-04 22:50:39 +00:00
nfc
Merge "docs: fixed five typos" into pi-dev
2018-09-18 12:00:24 -07:00
os
Merge "Add ConnectivityManager.getConnectionOwnerUid()" am: f8529dc891
2018-09-21 14:48:32 -07:00
permissionpresenterservice
Add @UnsupportedAppUsage annotations
2018-08-09 18:03:24 +01:00
preference
Merge "Dismiss Dialog in post instead of immediately" am: 9b2c026f10
2018-10-02 16:31:39 -07:00
print
Merge "Add @UnsupportedAppUsage annotations"
2018-08-01 15:58:23 -07:00
printservice
…
privacy
…
provider
Add emergency dialer option on power menu
2018-10-03 02:57:38 +00:00
se/omapi
Merge "Update the Open Mobile API version" into pi-dev
2018-05-09 18:35:47 +00:00
security
Inline two short methods from Conscrypt
2018-09-24 15:34:13 +01:00
service
Merge "Clarified FillCallback and SaveCallback behaviors." into pi-dev
2018-09-19 19:33:39 -07:00
speech
Merge "Add @UnsupportedAppUsage annotations" am: 14dea1f70c
2018-08-09 07:15:52 -07:00
text
Merge "docs: fixed five typos" into pi-dev
2018-09-18 12:00:24 -07:00
transition
Add @UnsupportedAppUsage annotations
2018-08-30 13:38:01 +01:00
util
docs: bug 37077993, object instead of array
2018-10-03 16:52:26 -07:00
view
resolve merge conflicts of a3e34fe9fe to pi-dev-plus-aosp
2018-10-04 22:50:39 +00:00
webkit
Merge "WebView: fix TracingController example usage" into pi-dev
2018-09-20 13:30:49 -07:00
widget
Merge "docs: Removes reference to the clock displaying seconds" into pi-dev
2018-09-21 12:53:01 -07:00
package.html
…