Andre Eisenbach 1cba33abf3 resolve merge conflicts of e6c7c8e8f2 to cw-e-dev ...

am: dfd4b8b25c

* commit 'dfd4b8b25c6454dec6d1bdc7cae4976b537fff2f':
  DO NOT MERGE Read Bluetooth interop database entries from settings (1/2)

2016-02-24 19:57:07 +00:00

..

accessibilityservice

…

accounts

Add get_accounts app op

2015-09-08 17:54:37 -07:00

animation

…

annotation

…

app

DO NOT MERGE ANYWHERE: Don't change screen on time on time changes

2016-02-19 21:05:07 +00:00

appwidget

…

bluetooth

DO NOT MERGE ANYWHERE Improve logging in BluetoothHeadsetClientCall.

2016-01-21 22:54:56 +00:00

content

Redact Account info from getCurrentSyncs am: f39549e389 am: 1a0aed3257 am: 0e7cd0a9fb am: be136b7a3e am: a947baa87c am: 0f292147f3

2016-01-20 18:08:33 +00:00

database

…

ddm

…

debug

…

emoji

…

gesture

…

hardware

[DO NOT MERGE ANYWHERE] Fix bodysensor permission

2016-01-26 20:10:27 +00:00

inputmethodservice

Fix: Wrong suggestion popup position in extract mode.

2015-07-17 16:36:57 -07:00

net

Merge "Exit getAllValidScorers early if not the primary." into mnc-dr-dev

2016-02-14 22:27:20 +00:00

nfc

Clear calling identify b4 Beam callback.

2015-12-21 10:33:06 +00:00

os

Merge "Revert "Revert "Track ashmem memory usage in Parcel""" into mnc-dr-dev

2015-10-23 17:29:13 +00:00

preference

Update volume slider on device changed.

2015-10-14 16:13:28 -04:00

print

…

printservice

…

provider

resolve merge conflicts of e6c7c8e8f2 to cw-e-dev

2016-02-24 19:57:07 +00:00

security

Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys.

2015-07-16 16:52:51 -07:00

service

Add 'until next alarm' option to QS zen panel.

2015-10-15 17:02:00 -04:00

speech

NPE occured when trying to parcel voice features.

2015-08-05 15:48:26 +01:00

test

…

text

Merge changes from topic 'grapheme-dr1.5' into mnc-dr1.5-dev

2016-01-12 01:10:52 +00:00

transition

Set the bounds on the drawable for ChangeBounds reparenting.

2015-10-19 23:42:38 +00:00

util

Fix issue #23122445: Add 420 density

2015-08-11 17:18:53 -07:00

view

[DO NOT MERGE ANYWHERE]: Allow button events in ambient.

2016-01-27 14:19:44 -08:00

webkit

Close ZipFiles correctly in WebViewFactory.

2015-08-10 16:40:50 +01:00

widget

Handle null result from getVirtualChildAt()

2016-01-12 14:23:05 +00:00

package.html

…