Dianne Hackborn eadbcd3352 resolved conflicts for merge of 8c3cb811 to master ...

Change-Id: I1cd4186b6b2dcb3d1d7d21c346384dbcc6e6a8df

2013-04-23 10:56:23 -07:00

..

accessibilityservice

Replacing accessibility service permissions with capability attributes.

2013-04-18 17:45:44 -07:00

accounts

Merge "Improve API and documentation" into jb-mr2-dev

2013-04-19 19:10:02 +00:00

animation

Remove Animatable interface

2013-04-16 17:54:14 -07:00

annotation

…

app

am 353bd75b: am 18414c4d: Merge "Provide SharedPreferences coherence guarantees for BackupAgent" into jb-mr2-dev

2013-04-20 21:36:57 -07:00

appwidget

am 177543db: am 3bcc2fba: Merge "Fix issue #8470131: Process thrash kills battery" into jb-mr2-dev

2013-03-26 17:28:19 -07:00

bluetooth

Remove BluetoothAdapterCallback. Simplify leScan Api

2013-04-17 20:49:33 -07:00

content

am 5b00f558: am b3bffa80: Merge "Follow up on issue #8159072: Spinner widget should be RTL\'ized" into jb-mr2-dev

2013-04-20 21:36:51 -07:00

database

am 4fd60792: am 5262a108: Merge "Complete documentation of whereArgs (Issue #43061)"

2013-02-08 17:03:42 -08:00

ddm

Support invoking view methods from hierarchy viewer

2013-01-22 17:25:46 -08:00

debug

Correct executable bit for source files

2012-11-07 10:27:31 -08:00

emoji

…

gesture

Correct executable bit for source files

2012-11-07 10:27:31 -08:00

hardware

am 31ae3908: am 8adf5d2b: Merge "Undeprecate old UsbDeviceConnection methods." into jb-mr2-dev

2013-04-18 19:22:33 -07:00

inputmethodservice

am 1a546dca: Merge "Fixed the problem ime invisible status despite being the icon that appears in the statusbar."

2013-04-18 15:28:18 -07:00

net

am d0202945: Merge "Listen for network disconnect." into jb-mr2-dev

2013-04-23 03:51:08 -07:00

nfc

Add direct NDEF push API.

2013-03-26 17:07:37 -07:00

os

resolved conflicts for merge of 8c3cb811 to master

2013-04-23 10:56:23 -07:00

preference

Fix issue #6595555: deal better with fragmentless headers.

2013-02-12 11:42:51 -08:00

provider

am d2b8cd75: am adff8b75: Merge "Add Javadoc" into jb-mr2-dev

2013-04-18 14:43:40 -07:00

security

keystore: Add flag for blobs to be unencrypted

2013-04-15 11:09:29 -07:00

service

Merge "Queues, queues, queues and input." into jb-mr2-dev

2013-04-08 23:59:24 +00:00

speech

Failing Text-To-Speech CTS tests fix.

2013-03-13 15:50:00 +00:00

test

Update scrubClass() to match CoreTestRunner.

2013-02-14 16:04:37 -08:00

text

am b241f60f: am c3d0a81a: Merge "Fix bug #8656546 API REVIEW: android.text.bidi / android.text" into jb-mr2-dev

2013-04-20 21:37:04 -07:00

util

am 68711f93: Merge "Revert "Simple MVC based binding mechanism for android controls."" into jb-mr2-dev

2013-04-19 10:56:22 -07:00

view

am 076e1f4c: am abc2763e: Merge "KeyEvent: update comment"

2013-04-20 22:48:08 -07:00

webkit

am a6854579: am fa1f7d21: am 07c9c291: am a2b0b35e: am 5fba3404: am 3c4fa654: am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host"

2013-04-20 00:38:31 -07:00

widget

am 089a75be: am a7b2625d: Merge "Fix for bug 8578258: GridLayout is forcing wrong width to TextView widgets" into jb-mr2-dev

2013-04-23 04:46:31 -07:00

package.html

…