Bryce Lee ccd3468567 resolve merge conflicts of b1301fa to nyc-mr1-dev-plus-aosp ...

Change-Id: Idb97adf36d981a340cdb5d24d4c3c3858d23e2fe

2016-10-18 10:07:00 -07:00

..

java

resolve merge conflicts of b1301fa to nyc-mr1-dev-plus-aosp

2016-10-18 10:07:00 -07:00

jni

Search for RRO both in SKU subdir and in vendor/overlay

2016-10-18 07:54:15 +00:00

res

Fix oversized icons and removed title line limit.

2016-10-17 23:23:40 +00:00

tests

Merge "Update time_zones_by_country.xml / delete unused files"

2016-10-17 16:30:06 +00:00