James Dong 34f48b78a3 am 2542d0de: am 7267baba: Merge "Enabled application using VideoView to get information events from MediaPlayer" into jb-mr1-dev ...

* commit '2542d0de1c0a1d304439e8281107694adb2202d4':
  Enabled application using VideoView to get information events from MediaPlayer

2012-07-30 13:41:35 -07:00

..

java

am 2542d0de: am 7267baba: Merge "Enabled application using VideoView to get information events from MediaPlayer" into jb-mr1-dev

2012-07-30 13:41:35 -07:00

jni

Merge "Fix Time.parse and Time.parse3339 crashing bugs."

2012-07-30 08:03:02 -07:00

res

Import translations. DO NOT MERGE

2012-07-26 13:55:40 -07:00

tests

Merge "Update WifiManager API"

2012-07-25 12:25:13 -07:00