Dianne Hackborn 0770f9ef66 resolved conflicts for merge of c8911ddd to master ...

Change-Id: I790b547268a23848577199256fc5abc9bdb7abb8

2013-08-02 23:43:31 -07:00

..

accessibilityservice

add attributes to accessibility service info

2013-06-06 18:37:59 -07:00

accounts

am 8811154e: am 423f8a8c: am 2618ac55: am a37bda7b: am 468d82bb: am 6bf45dc7: am b6a35268: B9257437: Typo in javadoc for AccountManager

2013-06-03 14:34:00 -07:00

animation

Optimize calls to Trace for animators

2013-06-04 09:37:38 -07:00

annotation

…

app

resolved conflicts for merge of c8911ddd to master

2013-08-02 23:43:31 -07:00

appwidget

am 18748035: am 379517b0: Merge "Fixing issue where AppWidgetHost.onProvidersChanged() was not being called. (Bug 9270309)" into jb-mr2-dev

2013-06-05 11:50:47 -07:00

bluetooth

Merge "Add debug menu to enable btsnoop"

2013-07-26 18:33:43 +00:00

content

am 710f3e2c: am 60ae2617: Merge "If frameworks wants ASCII casing, it should explicity ask for it."

2013-08-02 17:58:33 -07:00

database

am 710f3e2c: am 60ae2617: Merge "If frameworks wants ASCII casing, it should explicity ask for it."

2013-08-02 17:58:33 -07:00

ddm

Replace native Process getpid/getuid with calls to libcore equivalents.

2013-07-31 17:19:23 -07:00

debug

…

emoji

…

gesture

…

hardware

Support public virtual displays.

2013-08-02 21:11:07 -07:00

inputmethodservice

Fix possible NPE in IInputMethodWrapper

2013-07-01 19:19:31 +09:00

net

am 710f3e2c: am 60ae2617: Merge "If frameworks wants ASCII casing, it should explicity ask for it."

2013-08-02 17:58:33 -07:00

nfc

am 710f3e2c: am 60ae2617: Merge "If frameworks wants ASCII casing, it should explicity ask for it."

2013-08-02 17:58:33 -07:00

os

resolved conflicts for merge of 368d81fe to master

2013-07-31 18:25:47 -07:00

preference

Fix javadoc for new API

2013-08-01 12:44:01 -07:00

print

First cut of the print notifications.

2013-08-02 14:22:22 -07:00

printservice

First cut of the print notifications.

2013-08-02 14:22:22 -07:00

provider

am 710f3e2c: am 60ae2617: Merge "If frameworks wants ASCII casing, it should explicity ask for it."

2013-08-02 17:58:33 -07:00

security

…

service

StatusBarNotification cleanup.

2013-07-26 10:42:56 -04:00

speech

am 710f3e2c: am 60ae2617: Merge "If frameworks wants ASCII casing, it should explicity ask for it."

2013-08-02 17:58:33 -07:00

test

…

text

am 710f3e2c: am 60ae2617: Merge "If frameworks wants ASCII casing, it should explicity ask for it."

2013-08-02 17:58:33 -07:00

util

am 710f3e2c: am 60ae2617: Merge "If frameworks wants ASCII casing, it should explicity ask for it."

2013-08-02 17:58:33 -07:00

view

Support public virtual displays.

2013-08-02 21:11:07 -07:00

webkit

am 710f3e2c: am 60ae2617: Merge "If frameworks wants ASCII casing, it should explicity ask for it."

2013-08-02 17:58:33 -07:00

widget

Add automatic Drawable mirroring capability when in RTL layout direction

2013-08-01 15:15:10 -07:00

package.html

…