Jae Seo 711ae66a4b Merge "TIF: Set the surface secure" into nyc-dev ...

am: 9675f16bba

* commit '9675f16bba6837840038aea92e9db5893cecd33e':
  TIF: Set the surface secure

Change-Id: Ic70459cd294453907ce573c55ca0f16868177789

2016-06-06 20:01:14 +00:00

..

java/android

Merge "TIF: Set the surface secure" into nyc-dev

2016-06-06 20:01:14 +00:00

jni

Merge "Fix misc-macro-parentheses warnings in audio media jni." am: 9ecb10d1b5

2016-05-24 18:56:37 +00:00

lib

…

mca

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

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

packages/BluetoothMidiService

…

tests

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

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