Alan Viverette 68ae7b3d23 am 61c9ca8e: am 36884392: am 2d4dc8db: Merge "Obtain handler from context in CaptioningManager" into mnc-dev ...

* commit '61c9ca8e9dc6613a9256cccee947e32a74490cfa':
  Obtain handler from context in CaptioningManager

2015-06-15 18:42:52 +00:00

..

java

am 61c9ca8e: am 36884392: am 2d4dc8db: Merge "Obtain handler from context in CaptioningManager" into mnc-dev

2015-06-15 18:42:52 +00:00

jni

am 879e12a1: am dcb9e169: Merge "Set scaling mode for legacy device surfaces." into mnc-dev

2015-06-11 22:43:32 +00:00

res

Import translations. DO NOT MERGE

2015-06-15 09:14:54 -07:00

tests

Merge "remove usage of deprecated method setLatestEventInfo" into mnc-dev

2015-06-12 19:28:54 +00:00