Chet Haase dda0529bd5 am 0a8cc945: am b29c6299: am 0a77897b: Merge "Fix seeking behavior" into lmp-mr1-dev ...

* commit '0a8cc945ce92263ae8b66db7d08c224865b34470':
  Fix seeking behavior

2014-12-09 00:16:20 +00:00

..

java

am 0a8cc945: am b29c6299: am 0a77897b: Merge "Fix seeking behavior" into lmp-mr1-dev

2014-12-09 00:16:20 +00:00

jni

resolved conflicts for merge of 203c8171 to master

2014-12-04 16:06:34 -08:00

res

Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base

2014-12-08 20:29:25 +00:00

tests

Merge "Allow compilation with Jack."

2014-12-04 09:26:54 +00:00