Alan Viverette d8111138ab resolve merge conflicts of e5743753 to master. ...

Change-Id: I83f4b6abb669963b9c4fcdf9870317e019360d46

2015-01-27 15:23:09 -08:00

..

java

resolve merge conflicts of e5743753 to master.

2015-01-27 15:23:09 -08:00

jni

Merge "Add support for persist.sys.locale." automerge: dca2332 automerge: 117f161

2015-01-22 14:00:51 +00:00

res

am 445768bd: am 3fd8a433: Merge "Allow disabling the Options Pannel feature for TVs" into lmp-mr1-dev

2015-01-27 17:57:04 +00:00

tests

Remove dead code #11: Remove more unused classes

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