RoboErik e8dc96e103 am 0713f944: am e9905bd4: am f58a9091: Merge "Make setting the session token in MediaBrowserService synchronous" into lmp-mr1-dev ...

* commit '0713f9449306b6a08ca8102f76452db270b6486a':
  Make setting the session token in MediaBrowserService synchronous

2014-12-09 00:17:53 +00:00

..

java/android

am 0713f944: am e9905bd4: am f58a9091: Merge "Make setting the session token in MediaBrowserService synchronous" into lmp-mr1-dev

2014-12-09 00:17:53 +00:00

jni

am d7572b84: am 3ec380d3: am fc545733: Merge "Remove unused variables and functions, don\'t warn about unused parameters"

2014-11-25 19:57:42 +00:00

lib

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

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

mca

Merge "Add -Wno-unused-parameter to LOCAL_CFLAGS"

2014-12-04 01:04:09 +00:00

tests

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

2014-11-21 09:57:52 -08:00