Adam Lesinski 7caa8f14a7 Merge "Make 'idmap --scan' accept more than one input directory"

2015-10-12 18:53:25 +00:00

..

java

Merge "IndexOutOfBoundsException on addPreference in PreferenceGroup"

2015-10-07 16:38:02 +00:00

jni

Make 'idmap --scan' accept more than one input directory

2015-10-07 19:45:09 +02:00

res

Merge "Text size for empty view shall be styled according to theme"

2015-10-07 16:30:36 +00:00

tests

resolved conflicts for a884d81e to stage-aosp-master

2015-09-24 10:01:32 -07:00