Michael Wright 35bdda107f Merge "Make sure NaturalSurfaceLayout is consistent with SurfaceControl" ...

am: 6fa9c5cd01

* commit '6fa9c5cd01e36c62d5ad7efa230d4e52f457c148':
  Make sure NaturalSurfaceLayout is consistent with SurfaceControl

2016-01-12 22:40:10 +00:00

..

java/com/android/server

Merge "Make sure NaturalSurfaceLayout is consistent with SurfaceControl"

2016-01-12 22:40:10 +00:00

jni

USB MIDI: Fix race condition that causes intermittent connections.

2015-12-03 17:00:42 -08:00

Android.mk

…