Amith Yamasani 281dfe7fd2 Merge "Use ResolveInfo for label and icon for LauncherActivityInfo"

2015-02-04 18:46:54 +00:00

..

java

Merge "Use ResolveInfo for label and icon for LauncherActivityInfo"

2015-02-04 18:46:54 +00:00

jni

Merge "Rename Canvas::getSkCanvas to Canvas::asSkCanvas"

2015-01-30 14:25:24 +00:00

res

Import translations. DO NOT MERGE

2015-02-04 11:41:54 -06:00

tests

am 3a6d8f54: am 90d5bd8d: am feb362a5: am a0d3bfbe: am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation

2015-01-30 22:41:30 +00:00