OSDN Git Service
Filip Gruszczynski [Tue, 24 Mar 2015 02:58:54 +0000 (02:58 +0000)]
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base
Dmitriy Ivanov [Tue, 24 Mar 2015 02:57:09 +0000 (02:57 +0000)]
Merge "Load libraries directly from apk"
Michael Wright [Tue, 24 Mar 2015 02:56:08 +0000 (02:56 +0000)]
am
72261270: am
b42baaa8: am
978cfc39: Merge "SystemUI needs the SET_WALLPAPER permission"
* commit '
722612707e7eef745dab573ff226e2bd904295cb':
SystemUI needs the SET_WALLPAPER permission
Jeff Sharkey [Tue, 24 Mar 2015 02:38:47 +0000 (02:38 +0000)]
Merge "Introduce per-user GIDs for storage."
Craig Mautner [Tue, 24 Mar 2015 02:24:58 +0000 (02:24 +0000)]
Merge "Prevent unexpected rotation while going back to keyguard"
Jeff Sharkey [Mon, 23 Mar 2015 23:51:22 +0000 (16:51 -0700)]
Introduce per-user GIDs for storage.
This will eventually allow us to have a single unified filesystem
instead of requiring zygote to use bind mounts.
Change-Id: I29b819ab51498b4bab874e0367b1ab4165f84025
Svet Ganov [Thu, 19 Mar 2015 16:38:52 +0000 (09:38 -0700)]
Add install option to grant all runtime permissions.
Change-Id: I72ba67a72025646a3d53611621b0353d3a86677c
Svetoslav [Tue, 24 Mar 2015 01:52:08 +0000 (01:52 +0000)]
Merge "Runtime permissions: per user permission tracking."
Svetoslav [Thu, 26 Feb 2015 22:44:43 +0000 (14:44 -0800)]
Runtime permissions: per user permission tracking.
Before all permissions were granted at install time at once, so the user
was persented with an all or nothing choice. In the new runtime permissions
model all dangarous permissions (nomal are always granted and signature
one are granted if signatures match) are not granted at install time and
the app can request them as necessary at runtime.
Before, all granted permission to an app were identical for all users as
granting is performed at install time. However, the new runtime model
allows the same app running under two different users to have different
runtime permission grants. This change refactors the permissions book
keeping in the package manager to enable per user permission tracking.
The change also adds the app facing APIs for requesting runtime permissions.
Change-Id: Icbf2fc2ced15c42ca206c335996206bd1a4a4be5
Geoff Mendal [Tue, 24 Mar 2015 01:34:14 +0000 (01:34 +0000)]
am
abdbf186: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
abdbf1860c7855687aacbb4e293a6e6ec40c0213':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 24 Mar 2015 01:33:04 +0000 (01:33 +0000)]
am
4d17b954: (-s ours) am
2f12b803: (-s ours) am
eded9424: (-s ours) Import translations. DO NOT MERGE
* commit '
4d17b9549e0223b1efb2b66cf71e36b7a56420ee':
Import translations. DO NOT MERGE
Christopher Tate [Tue, 24 Mar 2015 01:13:14 +0000 (01:13 +0000)]
Merge "Back up and restore the set of enabled IMEs"
Griff Hazen [Tue, 24 Mar 2015 01:12:25 +0000 (01:12 +0000)]
Merge "Merge commit '
583c7c56' into master"
Jeff Tinker [Tue, 24 Mar 2015 00:10:20 +0000 (00:10 +0000)]
Merge "Note in docs that MediaDrm methods throw IllegalStateException"
Jeff Tinker [Tue, 24 Mar 2015 00:05:33 +0000 (00:05 +0000)]
Merge "Report key request message type for unprefixed EME"
Dianne Hackborn [Tue, 24 Mar 2015 00:02:37 +0000 (00:02 +0000)]
Merge "Add view ID, rework assist API."
Craig Mautner [Mon, 23 Mar 2015 23:56:41 +0000 (23:56 +0000)]
Merge "Recalculate input method top edge."
Griff Hazen [Mon, 23 Mar 2015 23:34:11 +0000 (16:34 -0700)]
Merge commit '
583c7c56' into master
Change-Id: I89c2c63005fbb6b1c058b2022f4469be5244505f
tiger_huang [Thu, 26 Feb 2015 06:45:32 +0000 (14:45 +0800)]
Prevent unexpected rotation while going back to keyguard
The original logic would let the app hidden by keyguard be able to
decide the orientation. While going back from a show-when-locked app
to keyguard, there would be a short time that keyguard is unable to
decide the orientation, which causes WMS uses the wrong orientation
from the wrong app.
https://code.google.com/p/android/issues/detail?id=155640
Change-Id: Ibc17bfe4603f68b241dc7380459ec9de42a3e259
Christopher Tate [Wed, 18 Mar 2015 20:06:16 +0000 (13:06 -0700)]
Back up and restore the set of enabled IMEs
The restored set of enabled IMEs/subtypes is merged into the
current state of the system, rather than simply replacing it.
This is because we do not want to accidentally disable or
reconfigure something that the user is currently relying on.
There's a certain amount of repetitive activity here, rebuilding
the enabled-state data structures in a different format, but it's
important for maintainability that the restore code be able to
rely on the core InputMethodUtils implementation of reading/writing
the settings element.
Bug
19822542
Change-Id: If0104151b3526da6ecc669adde3119a239ecafeb
Alan Viverette [Mon, 23 Mar 2015 23:25:02 +0000 (23:25 +0000)]
am
12062c6e: am
19537c0a: am
38fcaf40: Merge "Move arrow_pointer hotspot to better match actual tip"
* commit '
12062c6e99a8c17637177fe0e41ec95ea0fd977b':
Move arrow_pointer hotspot to better match actual tip
Chad Brubaker [Mon, 23 Mar 2015 23:24:51 +0000 (23:24 +0000)]
am
6050eb54: am
5b11b3d6: am
31cee318: Merge "Specify public exponent for RSA"
* commit '
6050eb5459a00b95bf135d40e9e37cd043c863e4':
Specify public exponent for RSA
Jeff Tinker [Mon, 16 Mar 2015 20:06:33 +0000 (13:06 -0700)]
Report key request message type for unprefixed EME
bug:
19771299
Change-Id: If76fa2988ca45632d0afff601c12f8f5f9908ed1
Dongwon Kang [Mon, 23 Mar 2015 23:18:26 +0000 (23:18 +0000)]
Merge "TIF: fix NPE in the case a hardware TV input is not ready to use."
Alan Viverette [Mon, 23 Mar 2015 23:03:07 +0000 (23:03 +0000)]
Merge "Fix build"
Geoff Mendal [Mon, 23 Mar 2015 22:56:40 +0000 (22:56 +0000)]
am
7163a0a1: (-s ours) am
57d7b5f4: (-s ours) am
1f9bad3c: (-s ours) Import translations. DO NOT MERGE
* commit '
7163a0a1a68e464b00273e71851b56769aecaeb3':
Import translations. DO NOT MERGE
Alan Viverette [Mon, 23 Mar 2015 22:37:28 +0000 (15:37 -0700)]
Fix build
Change-Id: Iaa8f3e7f4030b8eecc595cc1ab11e83c046714f1
Winson Chung [Mon, 23 Mar 2015 22:16:35 +0000 (22:16 +0000)]
Merge "Adding null check for focused stack before trying to switch affiliated tasks."
Winson Chung [Mon, 23 Mar 2015 22:12:53 +0000 (15:12 -0700)]
Adding null check for focused stack before trying to switch affiliated tasks.
Bug:
19870065
Change-Id: I674914b9d4a63cb9c73fa71bbc4b82c210e2001f
Craig Mautner [Mon, 23 Mar 2015 22:12:15 +0000 (22:12 +0000)]
Merge "Add null check and call destroy from single point."
Alan Viverette [Mon, 23 Mar 2015 22:11:29 +0000 (22:11 +0000)]
Merge "Update date and time picker headers for dark theme"
Alan Viverette [Mon, 23 Mar 2015 22:09:53 +0000 (15:09 -0700)]
Update date and time picker headers for dark theme
Bug:
19849816
Change-Id: If8e15fccbea322e9349fddc02f9dcf7d387f881b
Wale Ogunwale [Mon, 23 Mar 2015 21:59:58 +0000 (21:59 +0000)]
Merge "Default ActivityInfo.resizeable to false for all SDK versions."
Alan Viverette [Mon, 23 Mar 2015 21:54:14 +0000 (14:54 -0700)]
Docs nit
Change-Id: I390997826db6997f843cafc4136633937e185e82
Alan Viverette [Mon, 23 Mar 2015 21:36:07 +0000 (21:36 +0000)]
Merge "Clean up date picker"
Alan Viverette [Mon, 23 Mar 2015 21:26:09 +0000 (14:26 -0700)]
Clean up date picker
Bug:
19758502
Change-Id: I11ed62245d15d155335f5652000b9dc81185e2f9
Geoff Mendal [Mon, 23 Mar 2015 21:11:37 +0000 (21:11 +0000)]
am
d4f45766: (-s ours) Import translations. DO NOT MERGE
* commit '
d4f45766fabe3e305049dcd2f5b16b7e058a203a':
Import translations. DO NOT MERGE
Wale Ogunwale [Mon, 23 Mar 2015 21:10:41 +0000 (21:10 +0000)]
Merge "Changed recent multi-window UI to use persist.sys.debug.multi_window"
Jay Shrauner [Mon, 23 Mar 2015 21:03:31 +0000 (21:03 +0000)]
Merge "Check for empty lookup keys in getLookupUri"
Jeff Brown [Mon, 23 Mar 2015 21:02:28 +0000 (21:02 +0000)]
Merge "resolved conflicts for merge of
13d81b6d to master"
Julia Reynolds [Mon, 23 Mar 2015 21:01:29 +0000 (21:01 +0000)]
Merge "DPM constants for specifying minimum version numbers for DO and DIA."
Craig Mautner [Mon, 23 Mar 2015 21:00:47 +0000 (14:00 -0700)]
Add null check and call destroy from single point.
Ensure that calling destroy() on a DimLayer surface only happens
once.
Fixes bug
19660387.
Change-Id: Iee8ea20b5d7c3a8f81f14a3ecff66a1dc1a8d719
Dianne Hackborn [Fri, 20 Mar 2015 22:05:35 +0000 (15:05 -0700)]
Add view ID, rework assist API.
Add view ID information to the assist structure.
Also rework the API to simplify how it works by removing
the ViewNode wrapper around ViewNodeImpl -- these are now
just the same thing. And then add complexity by introducing
a formal WindowNode object that contains the top-level window
information (so I can add in some more window-specific info
in the future).
Change-Id: I5d525cf61ab6a73193e5cceb4c09d2d21cc27bae
Alan Viverette [Mon, 23 Mar 2015 20:54:40 +0000 (20:54 +0000)]
Merge "Fix default width and height for PopupWindow's decor view"
Jeff Brown [Mon, 23 Mar 2015 20:53:09 +0000 (13:53 -0700)]
resolved conflicts for merge of
13d81b6d to master
Change-Id: Icb72123fcf4b74e97d9a62504caf8a17eb65c9e6
Alan Viverette [Mon, 23 Mar 2015 20:50:53 +0000 (20:50 +0000)]
Merge "Correctly apply android:theme attribute from <include> tag"
Alan Viverette [Mon, 23 Mar 2015 20:45:53 +0000 (20:45 +0000)]
Merge "Update DatePicker and CalendarView to latest Material spec"
Alan Viverette [Mon, 23 Mar 2015 20:45:32 +0000 (20:45 +0000)]
Merge "Refactor theme colors, fix dialog background, accent in light Settings"
Wale Ogunwale [Mon, 23 Mar 2015 16:05:53 +0000 (09:05 -0700)]
Changed recent multi-window UI to use persist.sys.debug.multi_window
Consistent with what is been set under developer options.
Change-Id: I871ba1b612e344846c33fae68ad3286f7bec1b4b
Alan Viverette [Mon, 23 Mar 2015 20:42:06 +0000 (13:42 -0700)]
Refactor theme colors, fix dialog background, accent in light Settings
Bug:
19706726
Change-Id: If81c0a4775c366ae1a278d79f6353670182f7d27
Alan Viverette [Mon, 23 Mar 2015 20:13:25 +0000 (13:13 -0700)]
Update DatePicker and CalendarView to latest Material spec
Bug:
19431364
Change-Id: If364a051a5208d170495de4182e46b32c7560e08
Craig Mautner [Mon, 23 Mar 2015 18:42:55 +0000 (11:42 -0700)]
Recalculate input method top edge.
The bottom edge of an input method target window is set using the top
edge of the input method window. A switch from using the input
method's content frame's top edge to its display frame's top edge
(ag/634725) caused the underlying window to be obscured. This fix uses
the lower of the two frames to set the bottom edge of the target
window.
Fixes bug
19434816.
Change-Id: I5fe73fbe8a432b24a12c030f029cdfcd55e23274
Adam Lesinski [Mon, 23 Mar 2015 18:33:08 +0000 (18:33 +0000)]
Merge "Set the appliance (tv/watch) in the configuration earlier"
Alan Viverette [Mon, 23 Mar 2015 17:35:39 +0000 (17:35 +0000)]
Merge "Fix radial time picker for Explore by Touch and scroll actions"
Alan Viverette [Mon, 23 Mar 2015 17:34:23 +0000 (10:34 -0700)]
Fix radial time picker for Explore by Touch and scroll actions
Bug:
19889521
Change-Id: I4fa6b9e0459630ecdb4144f4640213415247735a
Zhijun He [Mon, 23 Mar 2015 17:30:27 +0000 (17:30 +0000)]
Merge "media: fix build break"
Zhijun He [Mon, 23 Mar 2015 17:10:04 +0000 (10:10 -0700)]
media: fix build break
clang/llvm complains the timestamp print formating.
Change-Id: Ie4bff9cbec90994709097d087d1c1f2a7d1465cf
Michael Wright [Mon, 23 Mar 2015 16:02:24 +0000 (16:02 +0000)]
am
b42baaa8: am
978cfc39: Merge "SystemUI needs the SET_WALLPAPER permission"
* commit '
b42baaa829be7efa692088e97a44712daecbf5f4':
SystemUI needs the SET_WALLPAPER permission
Michael Wright [Mon, 23 Mar 2015 15:55:53 +0000 (15:55 +0000)]
am
978cfc39: Merge "SystemUI needs the SET_WALLPAPER permission"
* commit '
978cfc39a10e1b95f9d6dfb5c8e9eb58a10ce0ec':
SystemUI needs the SET_WALLPAPER permission
Michael Wright [Mon, 23 Mar 2015 15:43:23 +0000 (15:43 +0000)]
Merge "SystemUI needs the SET_WALLPAPER permission"
Geoff Mendal [Mon, 23 Mar 2015 15:41:49 +0000 (15:41 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 23 Mar 2015 15:41:25 +0000 (15:41 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 23 Mar 2015 15:00:56 +0000 (08:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iab2d39063389eedb4a3fbaff17064b05583c1196
Auto-generated-cl: translation import
Geoff Mendal [Mon, 23 Mar 2015 14:52:26 +0000 (07:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I61b935f025acf57c934bca1b3ed954838c26a122
Auto-generated-cl: translation import
Geoff Mendal [Mon, 23 Mar 2015 13:15:29 +0000 (06:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7298b94a7d28dc5e674054aa7204d5c652fb12a9
Auto-generated-cl: translation import
Geoff Mendal [Mon, 23 Mar 2015 12:55:52 +0000 (12:55 +0000)]
am
2f12b803: (-s ours) am
eded9424: (-s ours) Import translations. DO NOT MERGE
* commit '
2f12b803e913117edbed7a9409f04b1d00686eba':
Import translations. DO NOT MERGE
Samuel Asteberg [Wed, 25 Feb 2015 14:51:05 +0000 (15:51 +0100)]
SystemUI needs the SET_WALLPAPER permission
If changing wallpaper when low on memory, retrieving the default
wallpaper may return null, which triggers error handling in
ImageWallpaper. This error handling tries to perform
WallpaperManager.clear(), but for that it needs SET_WALLPAPER
permission, which it does not have.
For users with apps that auto change wallpaper, this issue can
be frequent in low-memory conditions.
The solution is to add the permisson.
Change-Id: I81503c1667e3952c2dd15599969f7dcc51623e5b
Geoff Mendal [Mon, 23 Mar 2015 12:49:39 +0000 (12:49 +0000)]
am
eded9424: (-s ours) Import translations. DO NOT MERGE
* commit '
eded9424305cb6538cc0516670930a9f8fccbfd1':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Mar 2015 12:38:24 +0000 (05:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I911df3cb6476017bb6723403dbabb2dfbfc4bce2
Auto-generated-cl: translation import
Dongwon Kang [Mon, 23 Mar 2015 08:13:55 +0000 (17:13 +0900)]
TIF: fix NPE in the case a hardware TV input is not ready to use.
Bug:
19805327
Change-Id: I0c96ab9274ea2404d75b02205ef40f56fb4552f6
Alan Viverette [Mon, 23 Mar 2015 00:39:39 +0000 (17:39 -0700)]
Fix default width and height for PopupWindow's decor view
Fixes a regression whereby failing to explicitly set a width and height
would cause the popup window's decor view to be 0 width and height.
Also deprecates unnecessary method for setting window width and
height spec and replaces with less-confusing setters.
Cleans up javadoc for modified methods.
Bug:
19538371
Change-Id: I20da3ff02ad12e99adf14c056edd1a890b5c322a
Jeff Sharkey [Sun, 22 Mar 2015 20:03:54 +0000 (20:03 +0000)]
Merge "Bring MountService into the SystemService world."
Jeff Sharkey [Sun, 22 Mar 2015 03:41:00 +0000 (20:41 -0700)]
Bring MountService into the SystemService world.
Change-Id: I7f7db49ff373b199f7b81f184a7c62bee682af67
Alex Klyubin [Sun, 22 Mar 2015 00:40:51 +0000 (00:40 +0000)]
am
2110a28a: am
a4c4c575: Merge "Add android.security.NetworkSecurityPolicy."
* commit '
2110a28a6c7ef7d7802028d0a2dd9c14ceb432e1':
Add android.security.NetworkSecurityPolicy.
Griff Hazen [Sun, 22 Mar 2015 00:11:11 +0000 (00:11 +0000)]
am
38f75097: am
0b42ff79: Merge "Allow emulator to select a window outset bottom" into lmp-mr1-modular-dev
* commit '
38f75097ff0bc265dbfba9c40cda6c017078b82e':
Allow emulator to select a window outset bottom
Griff Hazen [Sun, 22 Mar 2015 00:05:48 +0000 (00:05 +0000)]
am
0b42ff79: Merge "Allow emulator to select a window outset bottom" into lmp-mr1-modular-dev
* commit '
0b42ff7916e6cc32c812a3be8f3e4ebdf96e8553':
Allow emulator to select a window outset bottom
Griff Hazen [Sat, 21 Mar 2015 23:59:45 +0000 (23:59 +0000)]
Merge "Allow emulator to select a window outset bottom" into lmp-mr1-modular-dev
Alan Viverette [Sat, 21 Mar 2015 20:26:16 +0000 (20:26 +0000)]
am
19537c0a: am
38fcaf40: Merge "Move arrow_pointer hotspot to better match actual tip"
* commit '
19537c0a18998622c8555573a7df0b32853fbde3':
Move arrow_pointer hotspot to better match actual tip
Alan Viverette [Sat, 21 Mar 2015 20:20:48 +0000 (20:20 +0000)]
am
38fcaf40: Merge "Move arrow_pointer hotspot to better match actual tip"
* commit '
38fcaf4037a50225b931551a48c898c7b0bb4db2':
Move arrow_pointer hotspot to better match actual tip
Alan Viverette [Sat, 21 Mar 2015 20:06:56 +0000 (20:06 +0000)]
Merge "Move arrow_pointer hotspot to better match actual tip"
Chad Brubaker [Sat, 21 Mar 2015 19:37:46 +0000 (19:37 +0000)]
am
5b11b3d6: am
31cee318: Merge "Specify public exponent for RSA"
* commit '
5b11b3d6c50c9fc705ae73a2ffcc4b9b57f96c78':
Specify public exponent for RSA
Chad Brubaker [Sat, 21 Mar 2015 19:31:22 +0000 (19:31 +0000)]
am
31cee318: Merge "Specify public exponent for RSA"
* commit '
31cee318f0494e6d77fc55599f285f534435405e':
Specify public exponent for RSA
Chad Brubaker [Sat, 21 Mar 2015 19:18:23 +0000 (19:18 +0000)]
Merge "Specify public exponent for RSA"
Dmitriy Ivanov [Tue, 30 Sep 2014 22:10:48 +0000 (15:10 -0700)]
Load libraries directly from apk
Introduced new 'extractNativeLibs' attribute to manifest/application.
Setting it to false prevents installer from extracting library from apk.
The default value for extractNativeLibs is true.
Bug:
8076853
Change-Id: I1aa2c039bb2a590ae72f256acc9ba5401c2c59b1
Geoff Mendal [Sat, 21 Mar 2015 16:21:31 +0000 (16:21 +0000)]
am
57d7b5f4: (-s ours) am
1f9bad3c: (-s ours) Import translations. DO NOT MERGE
* commit '
57d7b5f4eab81c0f9a61d5069b74ca034982a5f5':
Import translations. DO NOT MERGE
Geoff Mendal [Sat, 21 Mar 2015 15:34:55 +0000 (15:34 +0000)]
am
1f9bad3c: (-s ours) Import translations. DO NOT MERGE
* commit '
1f9bad3cb98964aaaecc2266102348b85d6fae9a':
Import translations. DO NOT MERGE
Geoff Mendal [Sat, 21 Mar 2015 10:47:38 +0000 (10:47 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 21 Mar 2015 08:36:45 +0000 (01:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id89aa9b780767034dc2b0b81d2cb0a49288ce882
Auto-generated-cl: translation import
Geoff Mendal [Sat, 21 Mar 2015 07:02:45 +0000 (07:02 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 21 Mar 2015 07:02:20 +0000 (02:02 -0500)]
Import translations. DO NOT MERGE
Change-Id: I0acc044f88445fe6d48f84bcaee6a971409ad144
Auto-generated-cl: translation import
Geoff Mendal [Sat, 21 Mar 2015 06:57:44 +0000 (06:57 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 21 Mar 2015 06:56:54 +0000 (23:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia2267065864b0a7ff750e2956f0bab7507b8c32c
Auto-generated-cl: translation import
Geoff Mendal [Sat, 21 Mar 2015 06:54:24 +0000 (06:54 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 21 Mar 2015 06:53:59 +0000 (23:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3b918278be7f5c4849a49821ab35385abaf440e4
Auto-generated-cl: translation import
Geoff Mendal [Sat, 21 Mar 2015 06:43:41 +0000 (06:43 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 21 Mar 2015 06:42:27 +0000 (23:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I05e39854eb2d78c22192faebdbfab579831b162a
Auto-generated-cl: translation import
Geoff Mendal [Sat, 21 Mar 2015 06:40:02 +0000 (06:40 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 21 Mar 2015 06:39:30 +0000 (23:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I43f19279f08e1c5b204836ee69e715c1f889acc7
Auto-generated-cl: translation import
Geoff Mendal [Sat, 21 Mar 2015 06:37:06 +0000 (06:37 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 21 Mar 2015 06:36:23 +0000 (23:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifac523c71970a048540fcfdbdb81b1b6d02e630a
Auto-generated-cl: translation import
OSDN Git Service
