drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
android_frameworks_base/core/java/android
History
Svetoslav Ganov f114809031 resolved conflicts for merge of 66edf2bb to honeycomb-plus-aosp 
Change-Id: I687ca9b7873890e3b30da16d5dde6b57ce92f0d6
2011-02-25 12:39:59 -08:00
..
accessibilityservice
…
accounts
Add TelephonyManager.getCurrentPhoneType
2011-02-01 19:22:15 -08:00
animation
docs: fix some typos
2011-02-23 10:54:31 -08:00
annotation
…
app
@hide DPM global proxy settings
2011-02-16 10:53:33 -08:00
appwidget
…
bluetooth
Fix BluetoothAdapter Connection change intent doc.
2011-02-01 16:53:14 -08:00
content
am be5f82ab: Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread
2011-02-16 10:24:15 -08:00
database
…
ddm
…
debug
…
emoji
…
gesture
…
hardware
docs: fix sensorevent code snippets
2011-02-23 10:57:23 -08:00
inputmethodservice
Follow up change to I741642ac
2011-01-30 11:02:09 +09:00
net
DO NOT MERGE - Increasing timeout to 60 sec
2011-02-23 13:55:11 -08:00
nfc
Support for NDEF on iCODE.
2011-02-24 22:03:20 -06:00
os
am 5ff79c3b: Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread
2011-02-23 18:03:34 -08:00
pim
am 1aba843d: am ccc802e1: Merge "Support quoted parameters" into gingerbread
2011-02-22 21:23:50 -08:00
preference
Merge "Fix 3419077: Allow subclasses to change SeekBarPreference action buttons." into honeycomb
2011-02-03 18:39:39 -08:00
provider
am a46a5cba: Merge "DO NOT MERGE No backup of country and sleep policy" into honeycomb
2011-02-23 14:38:10 -08:00
security
…
server
…
service/wallpaper
am 46ab5e13: Merge "add missing call to superclass method" into honeycomb
2011-02-01 20:55:15 -08:00
speech
resolved conflicts for merge of a314f32b to honeycomb-merge
2011-01-28 13:16:46 -08:00
test
…
text
am be46d145: Revert "Fix for StaticLayout bug with ellipsized text"
2011-02-04 19:23:10 -08:00
util
…
view
am 2e96f15d: Merge "Fix issues 3425035 and 3423785." into honeycomb
2011-02-04 14:08:25 -08:00
webkit
am 160c18a4: Merge "Need a public way to wait for cookie operations." into honeycomb
2011-02-04 11:22:41 -08:00
widget
resolved conflicts for merge of 66edf2bb to honeycomb-plus-aosp
2011-02-25 12:39:59 -08:00
package.html
…