Esteban Talavera 36ff488bb4 Merge "Fix getApplicationRestrictions documentation" into nyc-dev ...

am: a86d6c4df3

* commit 'a86d6c4df3b193060b4b725e1abfed4f69689843':
  Fix getApplicationRestrictions documentation

Change-Id: Idaab3c8f765d5e5631aa69557a9c3f194c9d5d33

2016-06-07 17:59:02 +00:00

..

java

Merge "Fix getApplicationRestrictions documentation" into nyc-dev

2016-06-07 17:59:02 +00:00

jni

Merge "Copy native tree\'s property when mutate vector drawable" into nyc-dev

2016-05-27 22:22:14 +00:00

res

Import translations. DO NOT MERGE

2016-06-06 15:28:06 -07:00

tests

Merge "Improve performance of LocaleList with Resources" into nyc-dev

2016-05-24 21:35:56 +00:00