Amith Yamasani ecd5afe1ef resolved conflicts for merge of 069d7e9b to master ...

Change-Id: Ia8fd5de3d4cc275fd358132bcb2c198d1e7b6877

2013-05-09 17:07:08 -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 617055d7: am 5d6dc425: Merge "Filter out dangerous CharSequences in Notification." into jb-mr2-dev

2013-05-08 17:32:50 -07:00

appwidget

…

bluetooth

Donot bind to GATT service when BLE is not supported

2013-05-08 19:26:57 -07:00

content

resolved conflicts for merge of 069d7e9b to master

2013-05-09 17:07:08 -07:00

database

am 601afaef: Merge "Someone\'s IDE chose the wrong Date."

2013-05-06 14:04:34 -07:00

ddm

…

debug

…

emoji

…

gesture

…

hardware

am e0dda90b: am aa64548d: Merge "Fixed unreleased wake lock isues and NPE." into jb-mr2-dev

2013-05-07 11:47:19 -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 341666c4: Merge "Fix sync problem in NsdManager" into jb-mr2-dev

2013-05-06 11:12:02 -07:00

nfc

…

os

Merge "Cleanup some of the thread merging."

2013-05-09 22:30:30 +00:00

preference

…

provider

am 3672624c: am 35b7b0b8: Merge "Add system setting key for dialpad autocomplete" into jb-mr2-dev

2013-05-08 15:05:25 -07:00

security

keystore: Add flag for blobs to be unencrypted

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

service

fix javadoc build

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

speech

Fix for TTS.setLanguage throwing MissingResourceException

2013-05-08 15:56:12 +01:00

test

…

text

Merge "enable selection of Linkify-annotated text"

2013-05-07 18:08:09 +00:00

util

am 0bb497b8: Merge "Use the newer ZoneInfoDB API."

2013-04-26 12:38:04 -07:00

view

am a9d5adea: am fb32c824: Merge "Fix start delay jank in ViewPropertyAnimator" into jb-mr2-dev

2013-05-09 16:28:33 -07:00

webkit

am 561dcc58: Merge "Avoid crash when TextToSpeech calls onInit() from the constructor." into jb-mr2-dev

2013-04-30 14:04:13 -07:00

widget

New UndoManager.

2013-05-07 15:05:09 -07:00

package.html

…