Alex Klyubin 1620a65d32 resolved conflicts for merge of 06adabdb to master ...

Change-Id: Ifb09e2e6242f79cabe76e95eacc982f6cc7e1a6c

2015-04-07 11:39:51 -07:00

..

accessibilityservice

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

accounts

[Auth:Last Credentials Timing] : Introducing API

2015-03-30 11:08:18 -07:00

animation

Add per-interval interpolation support for keyframe in xml resources

2015-04-02 16:28:40 -07:00

annotation

Add @TransitionRes for transition resource integers

2015-03-13 11:19:21 -07:00

app

Merge "No longer unlock activity manager to test whitelist"

2015-04-07 16:17:57 +00:00

appwidget

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

bluetooth

Merge commit 'd91f193' into merge2

2015-04-01 09:31:43 -07:00

content

Merge "Load libraries directly from apk"

2015-04-07 17:28:15 +00:00

database

Fix a few found doc problems.

2015-03-24 21:51:20 -04:00

ddm

…

debug

…

emoji

…

gesture

Annotate ARGB integer parameters with @ColorInt

2015-03-05 16:34:12 -08:00

hardware

Merge "Camera: update semantics of HIGH_QUALITY mode"

2015-04-06 18:55:12 +00:00

inputmethodservice

Add @ResourceInt annotations on APIs

2015-02-18 07:49:03 -08:00

net

Merge "Actually allow all valid characters in a Wi-Fi SSID."

2015-04-02 18:55:15 +00:00

nfc

…

os

Merge "Revert "Adding per UID WiFi power distribution.""

2015-04-07 06:19:55 +00:00

preference

am 3fa46a0f: am d7fb6d26: am a01250c7: Merge "Frameworks/base: Change String == to equals in Preference"

2015-03-28 05:18:14 +00:00

print

am e4bdf3c1: am be549f9b: Merge "Frameworks/base: Fix precedence bug"

2015-03-17 20:56:02 +00:00

printservice

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

provider

Add VOICE_CANCEL_ALARM/VOICE_DELETE_ALARM intents.

2015-04-06 16:29:39 -07:00

security

resolved conflicts for merge of 06adabdb to master

2015-04-07 11:39:51 -07:00

service

Various fixes and improvements...

2015-04-04 17:36:05 -07:00

speech

Add resource type annotations to some APIs

2015-03-13 11:20:45 -07:00

test

…

text

Merge "Load hyphenation data at Zygote init"

2015-04-06 20:02:16 +00:00

transition

Reset transitionAlpha when the transition is stopped early.

2015-04-03 15:01:40 -07:00

util

Add group scaling factor into stroke width.

2015-04-02 16:09:03 -07:00

view

Merge "Add accessibility action for scrolling to a collection position"

2015-04-07 17:21:08 +00:00

webkit

Add the Assist support to Webview

2015-04-06 20:13:37 -07:00

widget

Merge "Add accessibility action for scrolling to a collection position"

2015-04-07 17:21:08 +00:00

package.html

…