Hugo Benichi 01432b306d resolve merge conflicts of 9355bce0c3 to master ...

Test: none
Change-Id: Iac65e01d07edf79ec97e7d996f8cfee6f811606b

2017-02-17 10:47:58 +09:00

..

accessibilityservice

Merge "Provide text locations to accessibility services."

2017-02-07 19:14:09 +00:00

accounts

Use correct packageName for checking if it belongs to callingUid.

2017-02-14 18:35:05 -08:00

animation

Fix start time modification outside of updatePlayTime()

2017-02-14 11:54:40 -08:00

annotation

…

app

Merge "Adding "attach-agent" to ActivityManagerShellCommand" am: 05dfd10254 am: db0803b4e8

2017-02-16 23:37:48 +00:00

appwidget

…

bluetooth

Merge "Add a mechanism to configure the default A2DP codec priorities" am: acf34d8b62 am: cd6e0ee19d am: b7067e2b6c

2017-02-07 14:05:43 +00:00

companion

Auto-grant background execution and data access

2017-02-15 20:32:41 -08:00

content

Merge "Do not return cryptic strings from ClipData.Item.coerceToText"

2017-02-16 22:22:31 +00:00

database

…

ddm

…

debug

…

gesture

…

hardware

Merge "camera case fail for testSceneModes" am: b59cd66e93 am: a22c40839e am: a494d7287f

2017-02-16 21:57:34 +00:00

inputmethodservice

Track event flow to IMMS#setImeWindowStatus

2017-02-13 12:04:41 -08:00

metrics

…

net

resolve merge conflicts of 9355bce0c3 to master

2017-02-17 10:47:58 +09:00

nfc

…

os

Merge "Adding "attach-agent" to ActivityManagerShellCommand" am: 05dfd10254 am: db0803b4e8

2017-02-16 23:37:48 +00:00

permissionpresenterservice

…

preference

Merge "Fix the "Alarm volume" icon is displayed incorrectly" am: e0ba81110a am: 657abc315d am: 4b06345751

2017-02-16 13:23:02 +00:00

print

…

printservice

…

provider

Merge "DO NOT MERGE - Ensuring that there are per-user last stack active times." into nyc-mr2-dev

2017-02-16 03:13:14 +00:00

security

…

service

Merge "Refactor auto-fill"

2017-02-14 09:37:53 +00:00

speech

Ensure we set the notification marker position by calling updateMarker()

2017-02-14 12:35:13 +00:00

text

Merge "Introduce Backspace implemenation for flag emoji sequence."

2017-02-16 05:00:49 +00:00

transition

Merge "Fix doc for setReparentWithOverlay"

2017-02-07 07:35:48 +00:00

util

…

view

Merge "Remove final from View.setTooltipText/getTooltipText"

2017-02-16 18:56:32 +00:00

webkit

Merge "Make sure we cannot use packages targeting pre-O as WebView packages."

2017-02-02 14:34:04 +00:00

widget

Merge "Resolve pointer icon over FastScroller to arrow."

2017-02-16 21:18:42 +00:00

package.html

…