Fan Zhang d0f2f3dee5 resolve merge conflicts of 111b81d to master ...

Change-Id: I2b7eb6dfe73a94b6acd5ef47690ee72022b1ad6d

2016-08-22 17:26:34 -07:00

..

res

Import translations. DO NOT MERGE

2016-07-20 07:09:37 -07:00

src/com/android/settings

Tests for launch support on default feature

2016-08-22 21:52:46 +00:00

Android.mk

Tests for launch support on default feature

2016-08-22 21:52:46 +00:00

AndroidManifest.xml

Tests for launch support on default feature

2016-08-22 21:52:46 +00:00