Kenny Root add582122d resolved conflicts for merge of 485d7a31 to master ...

Change-Id: I058e19af8732df44457bdc614ee810a642dc25e4

2013-05-07 09:51:31 -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

resolved conflicts for merge of 485d7a31 to master

2013-05-07 09:51:31 -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

Merge "Added flush() for bluetooth output stream" into jb-mr2-dev

2013-04-26 01:18:34 +00:00

content

am b0675df8: am faa47b52: Merge "Idle maintenance scheduling broken." into jb-mr2-dev

2013-05-06 13:56:14 -07:00

database

Don't dump sql bindargs unless verbose mode is requested.

2013-05-01 15:28:37 -07:00

ddm

…

debug

…

emoji

…

gesture

…

hardware

am 460778f1: am 906e57d8: Merge "Fixed race conditions in GeofenceHardwareImpl." into jb-mr2-dev

2013-04-30 08:31:46 -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

Add direct NDEF push API.

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

os

resolved conflicts for merge of 485d7a31 to master

2013-05-07 09:51:31 -07:00

preference

…

provider

External storage provider, document picker UI.

2013-05-01 17:44:42 -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

…

test

…

text

am c2639e58: am 0bb4c701: Merge "Use ICU for getDateFormatOrder."

2013-04-30 12:17:25 -07:00

util

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

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

view

am a8549041: am 8c2e3a41: Merge "Optimize RTL properties resolution" into jb-mr2-dev

2013-05-06 13:56:17 -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

am c255800f: am 6d82f86f: Merge "Show CJK dates as all-numeric in the DatePicker."

2013-05-01 14:56:59 -07:00

package.html

…