Ji-Hwan Lee 4a2e599b5a am b3412adf: Merge "TvContract: Add channel logo and program thumbnail" into lmp-preview-dev ...

* commit 'b3412adf92b9d932b600acf44c4463cf06387a8e':
  TvContract: Add channel logo and program thumbnail

2014-06-05 22:23:11 +00:00

..

java/android

am b3412adf: Merge "TvContract: Add channel logo and program thumbnail" into lmp-preview-dev

2014-06-05 22:23:11 +00:00

jni

resolved conflicts for merge of f8272896 to master

2014-06-05 11:35:53 -07:00

lib

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

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

mca

Remove deprecated BufferQueue constructor

2014-03-12 17:02:07 -07:00

tests

camera2: Change android.lens.focusRange to Pair<Float,Float>

2014-05-30 11:28:49 -07:00