Wink Saville 02e3979d62 Merge commit 'e58e59cc' into fix-merge-conflict ...

* commit 'e58e59cc':
  ksd to lmp-sprout-dev

Conflicts:
	core/java/android/provider/CallLog.java
	telephony/java/android/telephony/SubInfoRecord.java
	telephony/java/android/telephony/SubscriptionManager.java
	telephony/java/android/telephony/TelephonyManager.java
	telephony/java/com/android/internal/telephony/ISub.aidl
	telephony/java/com/android/internal/telephony/TelephonyIntents.java

Change-Id: I2b892b692743a7ccde55185a2b90135bf28408cd

2014-09-15 12:40:02 -07:00

..

accessibilityservice

Clicking on partially coverd views by other views or windows.

2014-09-07 23:36:20 -07:00

accounts

Update string for account manager failures

2014-07-28 07:41:40 +00:00

alsa

…

animation

Allow Path Animations to support overshooting.

2014-09-12 15:46:02 -07:00

annotation

…

app

am e0b9e2f1: am 7d3d95e7: Merge "Fix exit transitions hiding views permanently." into lmp-dev

2014-09-15 14:43:29 +00:00

appwidget

Generalizing Recents widget category to Search box. (Bug 17334589)

2014-09-04 17:13:17 +02:00

bluetooth

Remove onConnectionCongested callback

2014-09-11 22:29:27 +00:00

content

Merge commit 'e58e59cc' into fix-merge-conflict

2014-09-15 12:40:02 -07:00

database

Print services setting changes not handled for managed profiles.

2014-08-26 18:19:13 -07:00

ddm

…

debug

…

emoji

…

gesture

…

hardware

Merge "SoundTrigger: fix KeyphraseRecognitionEvent parceling" into lmp-dev

2014-09-13 00:21:48 +00:00

inputmethodservice

Remove CursorAnchorInfoRequest and related stuff

2014-08-22 00:55:06 -07:00

net

Merge "Update VpnService Javadoc to reflect new UX." into lmp-dev

2014-09-11 22:41:24 +00:00

nfc

Remove old NFC unlock api

2014-08-19 13:13:10 -07:00

os

am 1c1683a3: am 1ddb7a6b: Merge "Saver: PowerManager call to set low power mode." into lmp-dev

2014-09-14 20:09:39 +00:00

preference

Fix accessibility events emitted from TwoStatePreference

2014-09-02 16:35:45 -07:00

print

Print spooler UI polish and bug fixes.

2014-09-05 15:21:50 -07:00

printservice

…

provider

am 21282583: am 66c16547: Merge "Renaming Telecomm to Telecom." into lmp-dev

2014-09-13 18:03:04 +00:00

security

Keep managed profile keystores in sync with owner

2014-08-29 23:03:42 +01:00

service

Add support for dozing after screen off.

2014-09-12 17:31:54 -07:00

speech

Replace TreeSet with HashSet.

2014-09-11 16:56:46 +01:00

test

…

text

resolved conflicts for merge of 2008cff7 to lmp-dev-plus-aosp

2014-09-08 13:08:43 -07:00

transition

Made Transitions act only the views that they target.

2014-09-12 16:15:44 -07:00

util

add android.util.SizeF.parseSizeF()

2014-09-09 21:16:03 -07:00

view

am 62b910c0: am 6ef642ca: Merge "Clean up view drawable tinting methods, fix default modes" into lmp-dev

2014-09-15 00:00:37 +00:00

webkit

am 6e6ae86a: am 46683a27: Remove an @removed member of andorid.webkit.WebResourceResponse.

2014-09-12 19:19:04 +00:00

widget

am 62b910c0: am 6ef642ca: Merge "Clean up view drawable tinting methods, fix default modes" into lmp-dev

2014-09-15 00:00:37 +00:00

package.html

…