Jorim Jaggi 00cd47a2d2 resolved conflicts for 0fb3f695 to master. ...

Change-Id: I679920313a872f8eb81cf00ffb6ffe037b8d0a3a

2015-09-09 18:40:05 -07:00

..

accessibilityservice

…

accounts

Add get_accounts app op

2015-09-08 17:54:37 -07:00

animation

Correct isRunning() behavior for AnimatorSet

2015-08-28 13:21:03 -07:00

annotation

Merge "b/22228577: Improve @IntDef annotation to handle special values and ranges"

2015-08-03 13:46:06 +00:00

app

am 4f1bd159: am db4efcfa: am f57d9856: am 4f7d0bc7: Merge "Add get_accounts app op" into mnc-dev

2015-09-09 02:08:18 +00:00

appwidget

…

bluetooth

Merge "Fix wrong javadoc in BluetoothAdapter."

2015-08-20 09:29:29 +00:00

content

Merge "Load app resource as shared library."

2015-09-09 16:08:12 +00:00

database

…

ddm

…

debug

…

gesture

…

hardware

am 463bf7cc: am 46154b8f: am b5304547: am 5e354223: Use AlarmManager for lockout reset

2015-09-09 21:59:23 +00:00

inputmethodservice

am abe22377: am 7423ca03: am d49c3b65: am 00eb5767: am 437eb6ce: Merge "Fix: Wrong suggestion popup position in extract mode." into mnc-dev

2015-07-21 00:14:50 +00:00

net

am fd183706: am 22262f31: am 0bc35668: am 017223ac: Merge changes from topic \'packet-keepalive-fixes\' into mnc-dr-dev

2015-09-09 01:04:38 +00:00

nfc

…

os

am 13d2fa50: am 740cf71c: am 56ecfcce: Handle KEYCODE_SOFT_SLEEP from Ungaze.

2015-09-08 05:38:30 +00:00

preference

Add Preference#onDetachedFromActivity

2015-08-12 15:27:51 -04:00

print

…

printservice

…

provider

resolved conflicts for 0fb3f695 to master.

2015-09-09 18:40:05 -07:00

security

Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys.

2015-07-16 16:52:51 -07:00

service

Allow third party condition providers.

2015-08-25 15:01:22 -04:00

speech

NPE occured when trying to parcel voice features.

2015-08-05 15:48:26 +01:00

test

…

text

Merge "Fix: Cursor can be at an invalid offset in EditText."

2015-08-28 06:57:22 +00:00

transition

…

util

Add LocaleList support to Paint and TextView.

2015-09-01 14:12:40 -07:00

view

Remove @hide for KEYCODE_SOFT_SLEEP.

2015-09-09 10:10:58 -07:00

webkit

am 447da857: am e869b398: am 20272bec: am c207c943: am c5283927: Close ZipFiles correctly in WebViewFactory.

2015-08-10 16:27:05 +00:00

widget

Invalidate when Drawable.setState() returns true

2015-09-04 10:10:42 -04:00

package.html

…