Glenn Kasten e613a1d530 am 1d6ca80e: resolved conflicts for merge of 1c92912b to lmp-mr1-dev-plus-aosp ...

* commit '1d6ca80ed6a27e324e52b8b944ef64dc07a92e34':
  AudioService: Fix monitorRotation for landscape applications

2014-10-02 17:38:08 +00:00

..

java/android

am 1d6ca80e: resolved conflicts for merge of 1c92912b to lmp-mr1-dev-plus-aosp

2014-10-02 17:38:08 +00:00

jni

am e6098661: am df261085: am 4d9face6: am 7432b884: am b3c802f2: Merge "camera2: Use valid dimensions for RGBA8888 gralloc buffers." into lmp-dev

2014-10-01 17:18:38 +00:00

lib

Fix name error in com.android.mediadrm.signer.xml

2014-05-30 08:27:33 -07:00

mca

resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aosp

2014-10-02 14:32:37 +01:00

tests

resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aosp

2014-10-02 14:32:37 +01:00