John Spurlock 8740cb1da6 resolved conflicts for merge of 29211d3a to master ...

Change-Id: I9691f41b12fbf52d0ef35a9bf5223edef7afdfd2

2013-04-05 16:18:59 -04:00

..

accessibilityservice

…

accounts

Block access to accounts for limited users.

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

animation

Adding small animation features

2013-04-04 11:00:07 -07:00

annotation

…

app

resolved conflicts for merge of 29211d3a to master

2013-04-05 16:18:59 -04: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 "Change BluetoothGattCallback methods argument from BluetoothDevice to BluetoothGatt" into jb-mr2-dev

2013-04-04 03:16:40 +00:00

content

am 1fdaace1: am 80fdc962: Merge "Error on conflicting <uses-permission>" into jb-mr2-dev

2013-04-04 17:34:31 -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

am 0f8e8b03: Merge "Warn when exposing file:// Uris beyond a process." into jb-mr2-dev

2013-04-03 16:29:55 -07:00

nfc

Add direct NDEF push API.

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

os

Phase 1 of refactoring SystemServer.

2013-04-04 09:49:22 -07:00

preference

…

provider

resolved conflicts for merge of 29211d3a to master

2013-04-05 16:18:59 -04:00

security

Remove keystore entries when package removed

2013-04-03 11:32:52 -07:00

service

New NotificationListenerService.

2013-04-05 19:54:44 +00:00

speech

Failing Text-To-Speech CTS tests fix.

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

test

…

text

am 1e2c967b: am 8712e4cc: Merge "use libphonenumber for Linkify.PHONE_NUMBER" into jb-mr2-dev

2013-04-04 07:50:49 -07:00

util

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

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

view

am 9ff408c1: am faec826b: Merge "Reduce the size of dirty invalidates" into jb-mr2-dev

2013-04-04 15:57:56 -07:00

webkit

Merge "Adding new Chomium-WebView property key, and deprecating old key." into jb-mr2-dev

2013-04-05 17:17:25 +00:00

widget

am 22da6f04: am e10b600d: am 984f94ee: am f29ca256: am 57b73b4a: am 72da7af6: am b461a13f: Merge "Doc update: unterminated code tags" into jb-mr1.1-docs

2013-04-03 18:14:08 -07:00

package.html

…