Ian Pedowitz a371084e29 resolved conflicts for merge of d4b8064e to master ...

Change-Id: I3d41b5bd0ecdd97f8e563b061fc8648d2206bc31

2015-08-03 23:38:43 -07:00

..

accessibilityservice

…

accounts

Merge "Permissions: GET_ACCOUNTS permission cleanup" into mnc-dev

2015-07-30 21:58:16 +00:00

animation

Fix clone in AnimatorSet

2015-08-03 16:06:56 -07:00

annotation

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

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

app

resolved conflicts for merge of d4b8064e to master

2015-08-03 23:38:43 -07:00

appwidget

…

bluetooth

Added a note about location permission

2015-07-16 19:40:13 -07:00

content

am aa860fd8: am 35c68de9: am 5dd9ef04: am b0bc8368: am 3011f645: Merge "Fix issue #22912704: "android.process.acore has stopped" dialog keeps popping up" into mnc-dev

2015-08-04 01:40:48 +00:00

database

…

ddm

…

debug

…

emoji

…

gesture

…

hardware

am 1055dbe4: am a9b4ed9e: am 20733ba9: am b1286a7a: am 7469060e: Merge "Make vendor keys visible in Camera2 java APIs." into mnc-dev

2015-08-03 16:45:43 +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 80d0df7c: am 62f05dfa: am 55a23950: am e8d3b394: am 692a244b: Fix build.

2015-08-01 17:53:17 +00:00

nfc

Merge "In NfcActivityManager, don't use UserHandle.CURRENT." into mnc-dev

2015-07-02 12:28:46 +00:00

os

am e2345774: am 772c6c0d: am 40f0efe0: Merge "Add a trace constant for PackageManager"

2015-08-03 19:40:48 +00:00

preference

…

print

…

printservice

…

provider

am b4cb66cd: am 0e7b3420: am 8b095b1c: am f83e8526: am 5680f9f6: Merge "Bug: 22879202 App compatibility with WRITE_SETTINGS failing" into mnc-dev

2015-08-03 20:36:16 +00:00

security

Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys.

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

service

Merge changes from topic 'fix-media-notifications' into mnc-dev

2015-07-30 02:57:06 +00:00

speech

Fix crash with engines that don't override getVoices().

2015-06-26 16:25:37 +01:00

test

…

text

Merge "Release text when finishing StaticLayout.Builder" into mnc-dev

2015-07-29 19:44:21 +00:00

transition

Fix Fade out during Activity Transition.

2015-07-06 10:23:13 -07:00

util

Revert "DO NOT MERGE Enhance local log."

2015-07-29 14:11:23 -07:00

view

Merge "Refactor AnimatorSet in prep for adding more functionalities"

2015-08-03 20:24:55 +00:00

webkit

Update onPause documentation

2015-07-31 14:02:57 -07:00

widget

am f2fea136: am dbb79ae9: am 4cf97c91: am 7bfe7b5b: am 5cca30a4: Merge "Revert two changes to LinearLayout measurement" into mnc-dev

2015-08-01 17:54:19 +00:00

package.html

…