Craig Mautner b12eb71c4f Merge commit 'bf581034' into manualmerge ...

Conflicts:
	tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java

Change-Id: I9fd35ea9166ec73ce1f9f6154aa4ec87e79e20cb

2013-11-12 19:17:06 -08:00

..

accessibilityservice

…

accounts

…

animation

Merge "Add ofArgb to ObjectAnimator and ValueAnimator."

2013-10-21 21:13:08 +00:00

annotation

…

app

Move some system services to their own sub package.

2013-11-12 09:06:42 -08:00

appwidget

…

bluetooth

am 46cfa691: am 9a53fbe4: am ce39e8ce: Merge "Change pairing api/intent permission from PRIVILEGED to ADMIN" into klp-dev

2013-10-21 16:11:07 -07:00

content

Merge "Add support for using ColorStateList as GradientDrawable's stroke"

2013-11-05 02:44:31 +00:00

database

…

ddm

…

debug

…

emoji

…

gesture

…

hardware

am e7d825d8: am ed676b21: am 4d12d8be: Merge "Camera2: Add support for partial result metadata quirk" into klp-dev

2013-11-12 10:34:28 -08:00

inputmethodservice

am 4c62da69: am 145cac85: am 4bf6eb17: Merge "Memory leak in IInputMethodSessionWrapper executeMessage"

2013-10-29 18:32:32 -07:00

net

am 7c053a2f: am cb134203: am 86f5a149: Merge "Change PacProxySelector to return unresolved addr" into klp-dev

2013-10-31 11:54:47 -07:00

nfc

additional javadoc for NfcAdapter.ReaderCallback

2013-10-17 11:57:06 -07:00

os

resolved conflicts for merge of c3eef190 to master

2013-11-07 15:05:26 -08:00

preference

am ebda68bf: am 52dedb89: am 512c722f: Merge "PreferencesFragment showing the breadcrumb area in single pane mode." into klp-dev

2013-11-11 20:52:34 -08:00

print

Cancel current work in PrintDocumentAdatper if printing is cancelled.

2013-10-31 14:30:58 -07:00

printservice

Complete implementation of the advanced print options.

2013-10-28 11:44:07 -07:00

provider

am 3c95033a: am 7774d8e7: am 44895333: clarify that ANDROID_ID is unique for each user in multi-user environment. bug: 8073630

2013-11-12 10:05:30 -08:00

security

…

service

…

speech

Catch MissingResourceException caused by bad locale in TTS.

2013-10-30 10:21:34 +00:00

test

…

text

am 24aecc3f: am 24a24b27: am ee4c8464: Merge "Handle surrogate pairs in Html.toHtml()" into klp-dev

2013-11-01 13:34:10 -07:00

transition

Fix docs

2013-11-06 15:00:36 -08:00

util

Merge "Add methods for removing children and actions from A11y nodes"

2013-11-07 23:34:08 +00:00

view

Merge commit 'bf581034' into manualmerge

2013-11-12 19:17:06 -08:00

webkit

am 72950e65: am d47be031: am 43e533de: Merge "Restore 4 classes that were accidentally deleted" into klp-dev

2013-10-18 17:42:18 -07:00

widget

am 40c81e4a: am 3105b6d2: am 12c32b4d: Merge "Make quick settings show the standard media router icon." into klp-dev

2013-11-11 15:23:40 -08:00

package.html

…