Jose Lima 43181fb72d am 4a40f7cc: Merge "Fix crash caused by disabling the Options panel on TVs" into lmp-mr1-dev automerge: 1f81973 ...

automerge: 485f6a6

* commit '485f6a60e0182767d57a5ab08d6438124a69439e':
  Fix crash caused by disabling the Options panel on TVs

2015-01-28 21:32:37 +00:00

..

java

am 4a40f7cc: Merge "Fix crash caused by disabling the Options panel on TVs" into lmp-mr1-dev automerge: 1f81973

2015-01-28 21:32:37 +00:00

jni

am 3523e4fc: am efe085ff: Merge "Handle bad ninepatch data." into lmp-mr1-dev

2015-01-27 23:34:35 +00:00

res

Import translations. DO NOT MERGE

2015-01-28 08:21:29 -06:00

tests

Remove dead code #11: Remove more unused classes

2015-01-27 18:15:50 +01:00