Sudheer Shanka 3b098778c6 Merge \"Fix disabling lockscreen for demo users.\" into nyc-mr1-dev ...

am: 407fd1ea62

Change-Id: I5625a9ef9fd35ee0cbf6cad7651f7a39eee8f059

2016-07-13 23:15:03 +00:00

..

java/android

Merge \"Fix disabling lockscreen for demo users.\" into nyc-mr1-dev

2016-07-13 23:15:03 +00:00

jni

Merge \"MediaDataSource: add DrmInitialization for IDataSource.\" into nyc-mr1-dev

2016-07-13 02:09:07 +00:00

lib

Unbundle RemoteService on TV - part 3

2016-04-22 12:21:34 -07:00

mca

resolve merge conflicts of 1599b981 to nyc-dev-plus-aosp

2016-04-28 12:08:15 -07:00

packages/BluetoothMidiService

BluetoothMidiDevice: change write type to support JamStik

2015-11-02 13:31:29 -08:00

tests

Merge "Code Patch for camera preview switch tests" into nyc-dev

2016-05-27 22:40:26 +00:00