Dianne Hackborn 377d6f00dc am 42fec57f: am d9968438: Merge "Fix issue with call backs from media process." into lmp-mr1-dev ...

* commit '42fec57f3addfb1958f814b5d6772ff81341ba20':
  Fix issue with call backs from media process.

2014-11-21 00:43:51 +00:00

..

java

am 42fec57f: am d9968438: Merge "Fix issue with call backs from media process." into lmp-mr1-dev

2014-11-21 00:43:51 +00:00

jni

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

2014-11-20 15:41:25 -08:00

res

am 50b02d61: am 5b881d43: Merge "Scale bitmaps in metadata sent to the system" into lmp-mr1-dev

2014-11-21 00:43:33 +00:00

tests

am 648f8106: am db3d76ab: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into lmp-mr1-dev

2014-11-13 00:40:28 +00:00