fionaxu 965084dd0c resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e ...

am: 1e8fe12f4e

Change-Id: I3122c1d81dde1088990bcbd2aff7eea478ead4fc

2016-06-08 17:04:09 +00:00

..

accessibilityservice

Fix broken activation of the selected view in accessibility mode.

2015-02-02 23:17:17 +00:00

accounts

…

alsa

…

animation

DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes

2015-06-10 22:54:09 +00:00

annotation

…

app

am d88e4d50: Merge "ActivityView: set surface on a background thread." into cw-d-mr1-dev

2015-06-02 22:36:42 +00:00

appwidget

DO NOT MERGE Don't take flags when creating app widget config activity.

2015-06-01 12:55:38 -07:00

bluetooth

DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (3/4)

2015-03-04 17:17:20 -05:00

content

resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e

2016-06-08 17:04:09 +00:00

database

am eb4bd19e: Terminate loop properly when cursor window is full. DO NOT MERGE

2015-06-02 03:33:31 +00:00

ddm

…

debug

…

emoji

…

gesture

…

hardware

am 9568772a: Merge "Frameworks/base: Fix format string in Geofence"

2015-03-17 21:42:55 +00:00

inputmethodservice

Fixed memory leak in ExtractEditLayout finish()

2015-03-27 13:23:11 +01:00

net

Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434 am: 42a5983364

2016-05-26 14:35:08 +00:00

nfc

am fae35eed: Merge "docs: Changed link in Java source code comment to repair 404" into mnc-preview-docs

2015-06-30 20:26:36 +00:00

os

am 10a7d744: am 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev

2015-09-23 11:33:13 +00:00

preference

Frameworks/base: Change String == to equals in Preference

2015-03-18 17:18:13 -07:00

print

Frameworks/base: Fix precedence bug

2015-03-17 20:31:22 +00:00

printservice

Merge "Correct a mistyped word "MSG_SET_CLEINT" to "MSG_SET_CLIENT""

2014-12-29 10:02:28 +00:00

provider

am a3404263: am 2f71ee24: am ffaee8bd: Merge "Fix NPE" into lmp-mr1-dev

2015-02-18 00:15:00 +00:00

security

Merge "Support KM_LONG_REP"

2015-04-16 21:56:13 +00:00

service

am 03850591: Handle outsets when resized is called due to rotation.

2015-07-02 00:47:48 +00:00

speech

…

test

…

text

am 1ad5c813: Fix typo in TtsSpan.

2015-06-15 22:11:30 +00:00

transition

Merge "Remove usages of FloatMath" automerge: a8e8cdb

2015-02-12 10:00:41 +00:00

util

Frameworks/base: Use || instead of |

2015-03-17 20:27:42 +00:00

view

am 0ec1328f: Calculate outset hint when adding window.

2015-06-30 20:20:48 +00:00

webkit

docs: Add text to JavaDocs regarding browser file access vulnerability

2015-04-22 17:29:12 -07:00

widget

docs: Clarified how to find out when a switch is toggled

2015-07-09 13:22:31 -07:00

package.html

…