Joe Fernandez 2eedc9f96a resolved conflicts for merge of 5864f5ed to master ...

Change-Id: I6e413076af7fce85a5300abb2ba529c589dbc7e8

2015-03-03 13:08:57 -08:00

..

accessibilityservice

Remove unused imports in frameworks/base.

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

accounts

New AccountManager method to copy accounts between users.

2014-11-14 11:09:27 +00:00

animation

Remove unused imports in frameworks/base.

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

annotation

…

app

resolved conflicts for merge of 5864f5ed to master

2015-03-03 13:08:57 -08:00

appwidget

Remove unused imports in frameworks/base.

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

bluetooth

Remove unused imports in frameworks/base.

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

content

Merge "Fix crash in UndoManager after parceling TextView"

2015-03-02 22:43:51 +00:00

database

Move apache specific portions of android.net.http to external/apache-http.

2015-02-12 11:15:49 +00:00

ddm

…

debug

…

emoji

…

gesture

Add @ResourceInt annotations on APIs

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

hardware

Remove unused imports in frameworks/base.

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

inputmethodservice

Add @ResourceInt annotations on APIs

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

net

Remove unused imports in frameworks/base.

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

nfc

am 3d6cfe0e: am 873b291b: Merge "fix issuse 65774"

2015-01-02 10:34:03 +00:00

os

Merge "Remove unused imports in frameworks/base."

2015-03-02 20:43:50 +00:00

preference

Remove unused imports in frameworks/base.

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

print

Add duplex mode support.

2015-02-04 05:48:48 +00:00

printservice

Remove unused imports in frameworks/base.

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

provider

Hide calllog entries for unregistered phone accounts

2015-03-03 00:33:35 +00:00

security

Remove unused imports in frameworks/base.

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

service

Remove unused imports in frameworks/base.

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

speech

Remove unused imports in frameworks/base.

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

test

…

text

Remove unused imports in frameworks/base.

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

transition

Remove unused imports in frameworks/base.

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

util

Remove unused imports in frameworks/base.

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

view

Merge "Remove unused imports in frameworks/base."

2015-03-02 20:43:50 +00:00

webkit

am 75666e90: Merge "Revert "Add potential future APIs for postmessage""

2015-03-03 02:20:57 +00:00

widget

Merge "Improve docs for drawable tint and color filters"

2015-03-03 16:46:48 +00:00

package.html

…