| commit | 386f208489d85d81755b64e92a84290953accfc0 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Mon Dec 12 11:04:39 2011 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Dec 12 11:04:39 2011 -0800 |
| tree | bf787432e060771d31aa1c2519363b09713264b6 | |
| parent | a5cbf023e349f2394ba6fc58d73b4375cfec4369 [diff] | |
| parent | c1e2aca5987df0f6e39fef48fd37e2902578bf07 [diff] |
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
diff --git a/drm/drmserver/DrmManager.cpp b/drm/drmserver/DrmManager.cpp index b2fa053..eaf884d 100644 --- a/drm/drmserver/DrmManager.cpp +++ b/drm/drmserver/DrmManager.cpp
@@ -99,11 +99,12 @@ status_t DrmManager::loadPlugIns() { + String8 pluginDirPath("/system/lib/drm"); + loadPlugIns(pluginDirPath); + String8 vendorPluginDirPath("/vendor/lib/drm"); loadPlugIns(vendorPluginDirPath); - String8 pluginDirPath("/system/lib/drm"); - loadPlugIns(pluginDirPath); return DRM_NO_ERROR; }
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_rotate_on.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_rotate_on.png index 6208581..02da243 100644 --- a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_rotate_on.png +++ b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_rotate_on.png Binary files differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_wifi_on.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_wifi_on.png index fe4d318..d645a3c 100644 --- a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_wifi_on.png +++ b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_wifi_on.png Binary files differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_rotate_on.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_rotate_on.png index 2536d92..9c117ae 100644 --- a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_rotate_on.png +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_rotate_on.png Binary files differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_wifi_on.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_wifi_on.png index 44e3577..4f51201 100644 --- a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_wifi_on.png +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_wifi_on.png Binary files differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_rotate_on.png b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_rotate_on.png index b375396..35d85e1 100644 --- a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_rotate_on.png +++ b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_rotate_on.png Binary files differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_wifi_on.png b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_wifi_on.png index 54e3d1e..bc1628f 100644 --- a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_wifi_on.png +++ b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_wifi_on.png Binary files differ
