Mita Yun d44280e288 resolved conflicts for merge of ebcbfb3f to master ...

Change-Id: I0658dd4a1418fbad91d9663e5b52418a979dc683

2012-12-10 16:50:22 -08:00

..

accessibilityservice

resolved conflicts for merge of ebcbfb3f to master

2012-12-10 16:50:22 -08:00

accounts

am cb5cb740: am aecee8a9: am 717797db: am f763b717: Merge "Authenticate correct user\'s account when pattern fails multiple times." into jb-mr1-dev

2012-11-08 06:17:59 -08:00

animation

am 768d9e1a: Merge "Correct executable bit for source files"

2012-11-07 11:52:12 -08:00

annotation

…

app

am d692c2c6: Merge "Fix EventLog string class problem in onOptionMenuSelected"

2012-12-10 11:41:29 -08:00

appwidget

am f663cad2: am 6c58b155: Merge "Make 3rd party lockscreen widgets work on secondary users" into jb-mr1.1-dev

2012-12-05 06:06:02 -08:00

bluetooth

am 3b5c4382: am b8e80eb5: am 4fd38e8d: Merge "Clean up debug messages" into jb-mr1.1-dev

2012-12-03 11:30:56 -08:00

content

am 5007dea9: am bac91ebd: am 860d0cd4: Merge "Cleaner initial boot." into jb-mr1.1-dev

2012-11-29 14:32:49 -08:00

database

am 768d9e1a: Merge "Correct executable bit for source files"

2012-11-07 11:52:12 -08:00

ddm

am 768d9e1a: Merge "Correct executable bit for source files"

2012-11-07 11:52:12 -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

Merge "Document that ByteBuffer position not updated"

2012-12-06 12:00:44 -08:00

inputmethodservice

resolved conflicts for merge of ebcbfb3f to master

2012-12-10 16:50:22 -08:00

net

Fix javadoc break

2012-12-07 09:56:50 -08:00

nfc

…

os

am ca4199ef: am 04f3b12f: am 5ea914f2: am 759c1005: Merge "Fix some typos and missing @param in android.os.Bundle" into jb-mr1-dev

2012-11-30 15:52:25 -08:00

preference

…

provider

am 9e129f37: am 924fc3e6: Merge "Add constant for Daydream settings." into jb-mr1.1-dev

2012-11-30 13:22:03 -08:00

security

Switch keystore to binder

2012-11-14 08:45:52 -08:00

server

am afdd978c: am 68e0da7e: Merge "Quiet down a lot of logging." into jb-mr1.1-dev

2012-11-29 14:25:40 -08:00

service

resolved conflicts for merge of ebcbfb3f to master

2012-12-10 16:50:22 -08:00

speech

Make TTS input string limit public and documented.

2012-11-27 03:25:27 -08:00

test

…

text

Add support for face attribute to HTML string resources

2012-11-27 14:34:33 -08:00

util

Adding pool management via the poolable APIs to some classes.

2012-11-30 17:16:17 -08:00

view

resolved conflicts for merge of ebcbfb3f to master

2012-12-10 16:50:22 -08:00

webkit

am 524962c8: am ff411ddb: Merge "Framework: Use holo alert drawables"

2012-12-07 12:24:20 -08:00

widget

Merge "Clear SearchView query field when collapsed as an action view"

2012-12-10 15:38:33 -08:00

package.html

…