Michael Wright b31c361077 resolved conflicts for merge of f652551b to master ...

Change-Id: I210f0e45d9163a8f5b70f99eba38f343c621a8e7

2013-04-25 17:09:58 -07:00

..

accessibilityservice

The touch exploration capability is dynamically granted pre-JellyBeanMR2.

2013-04-24 14:59:04 -07:00

accounts

Merge "Improve API and documentation" into jb-mr2-dev

2013-04-19 19:10:02 +00:00

animation

Give animators more useful names in systrace

2013-04-24 16:49:12 -07:00

annotation

…

app

am 4064af9b: am a7b6cbf1: Merge "API cleanup: NotificationListener" into jb-mr2-dev

2013-04-25 17:01:10 -07:00

appwidget

am 177543db: am 3bcc2fba: Merge "Fix issue #8470131: Process thrash kills battery" into jb-mr2-dev

2013-03-26 17:28:19 -07:00

bluetooth

Change permission of LE scan APIs from BLUETOOTH to BLUETOOTH_ADMIN

2013-04-24 17:51:37 -07:00

content

am 269c068d: am df181185: Merge "Hide TYPE_CHOICE_LEVEL since there\'s no visual representation for it yet." into jb-mr2-dev

2013-04-25 13:50:26 -07:00

database

Add ContentValues & CursorWindow to framework.aidl

2013-04-23 08:30:34 +10:00

ddm

…

debug

…

emoji

…

gesture

…

hardware

am 31ae3908: am 8adf5d2b: Merge "Undeprecate old UsbDeviceConnection methods." into jb-mr2-dev

2013-04-18 19:22:33 -07:00

inputmethodservice

am 1a546dca: Merge "Fixed the problem ime invisible status despite being the icon that appears in the statusbar."

2013-04-18 15:28:18 -07:00

net

am d0202945: Merge "Listen for network disconnect." into jb-mr2-dev

2013-04-23 03:51:08 -07:00

nfc

Add direct NDEF push API.

2013-03-26 17:07:37 -07:00

os

Track foreground activities in battery stats.

2013-04-25 17:01:37 -07:00

preference

…

provider

am d2b8cd75: am adff8b75: Merge "Add Javadoc" into jb-mr2-dev

2013-04-18 14:43:40 -07:00

security

keystore: Add flag for blobs to be unencrypted

2013-04-15 11:09:29 -07:00

service

API: getPkg() -> getPackageName()

2013-04-25 16:39:02 -04:00

speech

…

test

…

text

am b241f60f: am c3d0a81a: Merge "Fix bug #8656546 API REVIEW: android.text.bidi / android.text" into jb-mr2-dev

2013-04-20 21:37:04 -07:00

util

am 68711f93: Merge "Revert "Simple MVC based binding mechanism for android controls."" into jb-mr2-dev

2013-04-19 10:56:22 -07:00

view

resolved conflicts for merge of f652551b to master

2013-04-25 17:09:58 -07:00

webkit

am a6854579: am fa1f7d21: am 07c9c291: am a2b0b35e: am 5fba3404: am 3c4fa654: am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host"

2013-04-20 00:38:31 -07:00

widget

Revert "Skip 2nd measure pass whenever possible"

2013-04-25 14:55:28 -07:00

package.html

…