Mike Lockwood ba492eb636 am 278a04eb: Merge "Fix javadoc for MediaStore.Files.FileColumns constants" into honeycomb ...

* commit '278a04eb7a56459c2f9e3b47dcced6522a87f1d1':
  Fix javadoc for MediaStore.Files.FileColumns constants

2011-01-26 16:26:26 -08:00

..

accessibilityservice

…

accounts

Merge "If 'customTokens', let authenticator handle notification." into honeycomb

2011-01-25 16:13:12 -08:00

animation

…

annotation

…

app

am f95bd0fe: Merge "Argh forget to include my final part of the change." into honeycomb

2011-01-25 15:25:39 -08:00

appwidget

…

bluetooth

Fix some unmatched javadoc tags.

2011-01-26 11:46:56 -08:00

content

am f728411b: Merge "Fix bug #3395355 ("adb shell dumpsys content" should present human readable failure messages instead of error codes)" into honeycomb

2011-01-26 15:42:55 -08:00

database

…

ddm

…

debug

…

emoji

…

gesture

…

hardware

…

inputmethodservice

Merge "Clip touch event at SoftInputWindow to handle the event from Inset" into honeycomb

2011-01-25 05:42:36 -08:00

net

Tracking jarjar of org.bouncycastle to com.android.org.bouncycastle

2011-01-24 18:17:21 -08:00

nfc

Merge "Use classnames instead of ints for NFC techs." into gingerbread

2011-01-25 14:35:46 -08:00

os

resolved conflicts for merge of 2c1d0967 to honeycomb-plus-aosp

2011-01-26 11:10:36 -08:00

pim

…

preference

…

provider

Fix javadoc for MediaStore.Files.FileColumns constants

2011-01-26 15:57:07 -08:00

security

…

server

Do Not Merge. Don't connect to non keyboard HID devices.

2011-01-25 17:38:11 -08:00

service/wallpaper

am 3168a137: Merge "Fix surface frame size reporting." into honeycomb

2011-01-25 14:48:14 -08:00

speech

…

test

…

text

Merge "Fix for a call to startActivity from outside of an app." into honeycomb

2011-01-25 14:20:09 -08:00

util

Maybe fix issue #3093599: java.lang.IndexOutOfBoundsException...

2011-01-24 21:23:03 -08:00

view

am 9e7c2c6d: Merge "Optimize invalidate() calls." into honeycomb

2011-01-26 15:43:09 -08:00

webkit

Merge "Final polish of WebView accessibility support for no JavaScript case." into honeycomb

2011-01-26 14:39:47 -08:00

widget

Making requested indices the last to be pruned when we hit cache memory limits. (3368863)

2011-01-26 16:09:09 -08:00

package.html

…