Brian Colonna c849fbcf3d resolved conflicts for merge of 5856ee4b to master ...

Change-Id: I60ba85bc246b9cf25d467b2099535aad47f82ca7

2013-04-02 17:16:55 -04:00

..

accessibilityservice

…

accounts

Block access to accounts for limited users.

2013-03-30 18:25:49 -07:00

animation

Add auto-cancel ability to ObjectAnimator

2013-03-20 09:06:20 -07:00

annotation

…

app

am 160c0059: am 257719ec: am cccf6e9b: am 9f0ed0ee: am 58db9597: am e4ca0650: am 31ed1722: Merge "Doc update: clarify dumpsys instructions" into jb-mr1.1-docs

2013-03-29 16:23:53 -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 "Unhide Bluetooth Low Energy public APIs" into jb-mr2-dev

2013-03-28 23:04:48 +00:00

content

am 5c98b904: am 9e8ba8f2: Merge "Improve RestrictionEntry API" into jb-mr2-dev

2013-03-29 18:52:58 -07:00

database

…

ddm

…

debug

…

emoji

…

gesture

…

hardware

am 84bba952: am 297409fe: am 3abd5a00: am ef47a8c4: am 6d9ff503: Merge "Doc update: clarify rules for rate param" into jb-mr1.1-docs

2013-03-28 18:10:08 -07:00

inputmethodservice

Use input transport for communications between app and IME.

2013-03-26 15:42:39 -07:00

net

Merge "Add BT - DataTracker connection" into jb-mr2-dev

2013-03-28 16:45:33 +00:00

nfc

Add direct NDEF push API.

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

os

am 21b41af7: am d42ae93c: Merge "Make MessageQueue and Looper final." into jb-mr2-dev

2013-04-02 11:03:04 -07:00

preference

…

provider

Add SELinux updater and Settings-based enforcement switch.

2013-03-29 16:52:56 -07:00

security

KeyStore: add API to query storage type

2013-03-29 14:21:10 -07:00

service

…

speech

Failing Text-To-Speech CTS tests fix.

2013-03-13 15:50:00 +00:00

test

…

text

am 11139563: am dbca824d: Merge "Add DateFormat.getBestDateTimePattern." into jb-mr2-dev

2013-04-02 12:25:35 -07:00

util

am 55e9d98d: Merge "Clarify the documentation of SparseArray.indexOfValue."

2013-03-29 17:13:44 -07:00

view

resolved conflicts for merge of 5856ee4b to master

2013-04-02 17:16:55 -04:00

webkit

Don't recycle accessibility event after sending.

2013-03-20 16:27:33 -07:00

widget

am 7306da90: am 4b254881: Merge "AppSecurityPermissions: Add isGranted to isDisplayablePermission" into jb-mr2-dev

2013-03-27 09:24:33 -07:00

package.html

…