Andreas Gampe 6878ee57b4 Merge "Revert "Frameworks/base: Fix a constructor""

2015-03-16 17:51:15 +00:00

..

java

Merge "Revert "Frameworks/base: Fix a constructor""

2015-03-16 17:51:15 +00:00

jni

Drop unusable SELinux APIs.

2015-03-13 14:09:26 -04:00

res

Import translations. DO NOT MERGE

2015-02-26 15:54:57 -08:00

tests

resolved conflicts for merge of 517e0274 to lmp-mr1-dev-plus-aosp

2015-02-11 12:37:12 -08:00