Marco Nelissen 1d3488cba9 am 86e0b491: Merge "Add VideoView.getAudioSessionId()" into jb-mr2-dev ...

* commit '86e0b491d1b50e59221420de3005184b1dee8373':
  Add VideoView.getAudioSessionId()

2013-05-10 12:44:05 -07:00

..

java

am 86e0b491: Merge "Add VideoView.getAudioSessionId()" into jb-mr2-dev

2013-05-10 12:44:05 -07:00

jni

Merge "Fix bug where we incorrectly clipped the bounds to the device size." into jb-mr2-dev

2013-05-09 18:23:57 +00:00

res

Update nomenclature.

2013-05-08 11:18:23 -07:00

tests

am 4550dba5: Merge "Add wifi association test" into jb-mr2-dev

2013-05-08 15:21:12 -07:00