Derek Sollenberger f875fdf4fc am 673af558: Merge "Disable fallback chaining in Skia." into lmp-dev ...

* commit '673af5582dda0d0cb8a3667fbadef747d22193f1':
  Disable fallback chaining in Skia.

2014-07-30 19:36:41 +00:00

..

java

Added LEANBACK_SETTINGS Intent category

2014-07-30 18:56:25 +00:00

jni

Disable fallback chaining in Skia.

2014-07-30 14:40:00 -04:00

res

Import translations. DO NOT MERGE

2014-07-30 11:04:05 -07:00

tests

Make scan filter accepts prefix. Add tests.

2014-07-28 21:46:44 -07:00