Stephen Hines b6b17a575f resolved conflicts for merge of 764f08ad to master ...

Change-Id: I0a22225b2d26b6d806de2dcc70ffba29c96865b3

2015-04-07 14:47:32 -07:00

..

accessibilityservice

…

accounts

…

animation

Fix animation start jank due to expensive layout operations.

2015-04-07 12:27:17 -07:00

annotation

…

app

resolved conflicts for merge of 764f08ad to master

2015-04-07 14:47:32 -07:00

appwidget

…

bluetooth

…

content

Merge "Load libraries directly from apk"

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

database

…

ddm

…

debug

…

emoji

…

gesture

…

hardware

Merge "Camera: update semantics of HIGH_QUALITY mode"

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

inputmethodservice

…

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

…

print

…

printservice

…

provider

Merge "Add Camera prewarm intent."

2015-04-07 18:50:54 +00: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

…

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 "Fix animation start jank due to expensive layout operations."

2015-04-07 19:28:57 +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

…