Amith Yamasani 0c25fbde82 resolved conflicts for merge of 5f1c2dbc to master ...

Change-Id: I4d08ad224c8cddd1d379c0f9ec326165a08dd651

2015-06-19 17:04:02 -07:00

..

accessibilityservice

…

accounts

Revert "Revert "Permissions: Fix account related permissions.""

2015-06-11 14:10:04 -07:00

animation

DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes

2015-06-10 22:54:09 +00:00

annotation

…

app

am 97d2493f: am b94761d0: Merge "App Standby : Association between content providers and their sync adapter" into mnc-dev

2015-06-19 22:28:24 +00:00

appwidget

AppWidgetServiceImpl should use ParceledListSlice as return object

2015-06-17 15:23:31 -07:00

bluetooth

Bluetooth energy: fix overflow in calculation

2015-06-15 17:19:07 -07:00

content

resolved conflicts for merge of 5f1c2dbc to master

2015-06-19 17:04:02 -07:00

database

…

ddm

…

debug

…

emoji

…

gesture

…

hardware

Merge "ImageReader: Fix format workarounds for legacy devices" into mnc-dev

2015-06-19 19:51:42 +00:00

inputmethodservice

Fix JavaDoc error in I392166c77cd9dd2c432dc4f1274312f8355de02b.

2015-06-12 04:57:29 +00:00

net

Merge "system_server: add two child chains to firewall" into mnc-dev

2015-06-17 23:50:28 +00:00

nfc

Merge "Make peer LLCP version an int." into mnc-dev

2015-06-10 06:58:20 +00:00

os

am 52e7f8c7: am bd9b25ef: am b6a09299: Merge "BatteryStats: Record doze wake locks" into mnc-dev

2015-06-19 21:48:37 +00:00

preference

Volume: Disable seekbar prefs when zen muted.

2015-06-10 19:04:40 -04:00

print

…

printservice

Propagete document meta-data to custom print UI.

2015-06-11 03:32:09 -07:00

provider

am aad6327d: am 495cac60: am c723b8d7: Merge "Don\'t save cached contact info in call log when adding call" into mnc-dev

2015-06-19 21:40:32 +00:00

security

Add new error codes for rate-limit and max-use failures.

2015-06-19 09:07:13 -06:00

service

Merge "drop corrupt notifications in the Listener" into mnc-dev

2015-06-19 15:15:22 +00:00

speech

Delete android.speech.srec.*

2015-06-16 19:40:09 +01:00

test

…

text

Merge "Update file size formatting." into mnc-dev

2015-06-16 04:47:21 +00:00

transition

Merge "Have the final setVisibility cause a requestLayout." into mnc-dev

2015-06-16 15:27:27 +00:00

util

Implement some control over ALLOW_WHILE_IDLE alarms.

2015-06-12 12:37:35 -07:00

view

am 54103b79: am 2508c6df: am 07e440b2: Merge "Fix FloatingToolbar flickers." into mnc-dev

2015-06-19 16:26:05 +00:00

webkit

Clarify handling client certificates

2015-06-19 11:46:29 -07:00

widget

am bbe35b32: am 0cadef68: am f3e8dca8: Merge "Create ListPopupWindow handler against main looper" into mnc-dev

2015-06-19 20:43:42 +00:00

package.html

…