OSDN Git Service
Selim Cinek [Fri, 18 Mar 2016 18:42:25 +0000 (11:42 -0700)]
Only isolating children now when not expanded
If a group is expanded and a child is huned,
it is not isolated anymore as the user can
already see it.
Bug:
24866646
Change-Id: I671aad6556c2c1c7e1cee2b45f54834ef9e2e093
Selim Cinek [Fri, 18 Mar 2016 02:39:00 +0000 (19:39 -0700)]
Fixed a bug where children could have fake shadows
Bug:
24866646
Change-Id: I2a6e7749a16eb62480abbb49b5f600af1e8c327a
Selim Cinek [Fri, 18 Mar 2016 01:27:36 +0000 (18:27 -0700)]
Cleaned up notification group handling with HUNS
The group summary could still be visible even though
all children were heads upped. The notification
is now suppressed instead.
Change-Id: Ic489925d9881bd2f59170f9c0fe9a3dbb17e25aa
Bug:
27104166
Fixes:
27572569
Selim Cinek [Thu, 17 Mar 2016 22:01:38 +0000 (15:01 -0700)]
Removed the summary line for notification groups
Because it was too noisy.
Bug:
27431551
Change-Id: I9593698eda6327ad7c7b4ec50a980e318a93f3b9
Selim Cinek [Thu, 17 Mar 2016 17:28:55 +0000 (10:28 -0700)]
Hiding the summary of notification groups with a single child now
Groups with only a single child are now hidden from the user and
the child is directly surfaced.
Bug:
27104166
Change-Id: Ifc1edf0ba857ae2a3c7ef7146dee6aa7fb29fe4b
Daichi Hirono [Tue, 22 Mar 2016 01:34:58 +0000 (01:34 +0000)]
Merge "Fix the logic to add suffix when copying." into nyc-dev
Sergei Vasilinetc [Tue, 22 Mar 2016 01:33:48 +0000 (01:33 +0000)]
Merge "Clean up and rename TypefaceImpl" into nyc-dev
Daichi Hirono [Fri, 18 Mar 2016 09:29:56 +0000 (18:29 +0900)]
Fix the logic to add suffix when copying.
Previously the logic add '.' even if the extension is empty.
BUG=
27729309
Change-Id: I3fa4b09fea977b5c716ec5cbbbc7d9f4ab96db08
Daichi Hirono [Tue, 22 Mar 2016 01:21:11 +0000 (01:21 +0000)]
Merge "Add USB_HOST_CONNECTED extra to ACTION_USB_STATE sticky intent." into nyc-dev
Daichi Hirono [Tue, 22 Mar 2016 01:20:24 +0000 (01:20 +0000)]
Merge "Change the title of DocumentsUI from "Files" to "Downloads"." into nyc-dev
Jaewan Kim [Tue, 22 Mar 2016 01:11:07 +0000 (01:11 +0000)]
Merge "PIP: Prevent PipOverlayActivity from restarting" into nyc-dev
Jaewan Kim [Tue, 22 Mar 2016 00:34:17 +0000 (00:34 +0000)]
Merge "Hide system UI activity with FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS in Recents" into nyc-dev
Sergei Vasilinetc [Tue, 22 Mar 2016 00:12:30 +0000 (00:12 +0000)]
Merge "Reland: Move text logic from jni to hwui level" into nyc-dev
Makoto Onuki [Tue, 22 Mar 2016 00:12:04 +0000 (00:12 +0000)]
Merge "ShortcutManager: Clean up for uninstalled packages." into nyc-dev
Chris Tate [Tue, 22 Mar 2016 00:03:12 +0000 (00:03 +0000)]
Merge "Add API to read the current wallpaper's ID" into nyc-dev
sergeyv [Thu, 17 Mar 2016 18:24:22 +0000 (11:24 -0700)]
Clean up and rename TypefaceImpl
bug:
25865834
Change-Id: I77e8a627163e040a5c25865054a8a936052af367
sergeyv [Mon, 21 Mar 2016 22:38:21 +0000 (15:38 -0700)]
Reland: Move text logic from jni to hwui level
Initial CL: https://googleplex-android-review.git.corp.google.com/#/c/886854/
Change-Id: I9dfd85fe1d2a2c44f4360c8a29fd58d80e6f31c8
Makoto Onuki [Mon, 21 Mar 2016 22:47:52 +0000 (15:47 -0700)]
ShortcutManager: Clean up for uninstalled packages.
Bug
27548047
Change-Id: I95ca832af496fbf71023eb27a7e2647c124ffb86
Wale Ogunwale [Mon, 21 Mar 2016 22:53:09 +0000 (22:53 +0000)]
Merge "Don't finish resolver activity onStop if it is for home intent" into nyc-dev
Yohei Yukawa [Mon, 21 Mar 2016 22:45:19 +0000 (22:45 +0000)]
Merge "Add a comment about ResultReceiver lifetime." into nyc-dev
Deepanshu Gupta [Mon, 21 Mar 2016 22:45:11 +0000 (22:45 +0000)]
Merge "Add guard around getXmlFileParser() call" into nyc-dev
Christopher Tate [Mon, 21 Mar 2016 21:53:15 +0000 (14:53 -0700)]
Add API to read the current wallpaper's ID
Also regularize cross-user call handling throughout.
Bug
27743435
Change-Id: Ibc530d0576d657723a613888357a6ea71b482763
Philip P. Moltmann [Mon, 21 Mar 2016 22:28:46 +0000 (22:28 +0000)]
Merge "Don't mix UI and print job state" into nyc-dev
Paul Stewart [Mon, 21 Mar 2016 21:50:35 +0000 (21:50 +0000)]
Merge "Fix string equality comparison" into nyc-dev
Jeff Sharkey [Mon, 21 Mar 2016 21:11:56 +0000 (21:11 +0000)]
Merge "Ignore wildcard network policies." into nyc-dev
Jeff Sharkey [Mon, 21 Mar 2016 21:10:54 +0000 (21:10 +0000)]
Merge "Skip app widget config changes when user locked." into nyc-dev
Jeff Sharkey [Mon, 21 Mar 2016 21:10:33 +0000 (21:10 +0000)]
Merge "Check "Secure start-up" before toggling emulation." into nyc-dev
Jeff Sharkey [Mon, 21 Mar 2016 21:10:13 +0000 (21:10 +0000)]
Merge "Mark even more Bundles as defusable." into nyc-dev
Deepanshu Gupta [Mon, 21 Mar 2016 21:07:20 +0000 (14:07 -0700)]
Add guard around getXmlFileParser() call
Prevents the need to update the LayoutLib API level.
Bug: http://b.android.com/202942
Change-Id: I507239148ab8d6d45406624dba569c8b7197f979
Sergei Vasilinetc [Mon, 21 Mar 2016 21:06:45 +0000 (21:06 +0000)]
Merge "Revert "Move text logic from jni to hwui level"" into nyc-dev
Sergei Vasilinetc [Mon, 21 Mar 2016 21:03:40 +0000 (21:03 +0000)]
Revert "Move text logic from jni to hwui level"
This reverts commit
a7f6bba1a3565c19715e878dfe7f0e01022944ff.
Change-Id: If4f36f87a85411b6128fd92d391313803ccaf9dd
Alan Viverette [Mon, 21 Mar 2016 20:25:13 +0000 (20:25 +0000)]
Merge "Set drawable callbacks last" into nyc-dev
Sergei Vasilinetc [Mon, 21 Mar 2016 20:11:25 +0000 (20:11 +0000)]
Merge "Move text logic from jni to hwui level" into nyc-dev
Wale Ogunwale [Mon, 21 Mar 2016 20:04:18 +0000 (20:04 +0000)]
Merge "Added support to specify animation duration when resizing stack" into nyc-dev
Philip P. Moltmann [Mon, 21 Mar 2016 19:48:58 +0000 (12:48 -0700)]
Don't mix UI and print job state
In PrintActivity.OnPause we set the print job state based on the
PrintActivity state. The issue was that FINISHED was interpreted as
"cancel print job". Actually with FINISHED does not tell what state the
job should be in.
The only purpose of the finished state was to guard against
double-invocation of doFinish().
Hence remove this recently introduced state and use a simple boolean to
guard against doule invocation of doFinish().
Bug:
27760331
Change-Id: I0767c2b0b9c28e8904647cc832c236f67f92bcfe
Ruchi Kandoi [Mon, 21 Mar 2016 19:37:50 +0000 (19:37 +0000)]
Merge "PowerManagerService: Adds a VrStateListener to track Vr Mode state changes." into nyc-dev
Ruben Brunk [Mon, 21 Mar 2016 19:32:15 +0000 (19:32 +0000)]
Merge "Move setup to earlier boot phase." into nyc-dev
Phil Burk [Mon, 21 Mar 2016 19:30:21 +0000 (19:30 +0000)]
Merge "Audio ENCODING_IEC61937: enforce use of CHANNEL_OUT_STEREO" into nyc-dev
Alan Viverette [Mon, 21 Mar 2016 19:30:13 +0000 (19:30 +0000)]
Merge "Account for top and bottom padding in ListPopupWindow" into nyc-dev
Chris Craik [Mon, 21 Mar 2016 19:26:05 +0000 (19:26 +0000)]
Merge "Handle unbounded drawPaint/drawGLFunction operations safely" into nyc-dev
Jeff Sharkey [Mon, 21 Mar 2016 19:12:59 +0000 (13:12 -0600)]
Ignore wildcard network policies.
They never should have been persisted to disk in the first place.
Bug:
24972775
Change-Id: If9254f74455823f9fda9545fdf543fc7250a4016
Ruben Brunk [Mon, 21 Mar 2016 19:10:38 +0000 (12:10 -0700)]
Move setup to earlier boot phase.
Bug:
27764094
Change-Id: I2a01b47129a3ef2a4ae37fbf98eb9ebe81061e62
Jeff Sharkey [Mon, 21 Mar 2016 19:07:32 +0000 (13:07 -0600)]
Skip app widget config changes when user locked.
Bug:
27377050
Change-Id: Ic63b06159cf59106b4e7bc62ec5f3e89d47321c5
Adrian Roos [Mon, 21 Mar 2016 19:03:50 +0000 (19:03 +0000)]
Merge "Don't copy Bitmaps when cloning RemoteViews" into nyc-dev
Jeff Sharkey [Mon, 21 Mar 2016 19:02:06 +0000 (13:02 -0600)]
Check "Secure start-up" before toggling emulation.
To fully emulate FBE we need to avoid the Cryptkeeper bounce, so
check to make sure user has disabled "Secure start-up" so vold can
unlock early during boot.
Bug:
27595501
Change-Id: Ic0d03f94982534381671e1039f14d1fd06bc0e4e
Deepanshu Gupta [Mon, 21 Mar 2016 18:59:59 +0000 (18:59 +0000)]
Merge "Add guard around getXmlFileParser() call" into mnc-ub-dev
am:
8662173 -s ours
* commit '
86621737fc1ba2d6ce7cb97e61fc8ce186eb851a':
Add guard around getXmlFileParser() call
Deepanshu Gupta [Mon, 21 Mar 2016 18:53:55 +0000 (18:53 +0000)]
Merge "Add guard around getXmlFileParser() call" into mnc-ub-dev
Paul Stewart [Mon, 21 Mar 2016 16:51:27 +0000 (09:51 -0700)]
Fix string equality comparison
Don't use "==" to compare strings.
Bug:
25624963
Change-Id: Id25696e4fdcbcf4d48ec74e8ed65c1a33716b30c
Abodunrinwa Toki [Mon, 21 Mar 2016 18:46:48 +0000 (18:46 +0000)]
Merge "Update A11y IME switch button content description." into nyc-dev
Jeff Sharkey [Mon, 21 Mar 2016 18:37:54 +0000 (12:37 -0600)]
Mark even more Bundles as defusable.
Bug:
27766193
Change-Id: Ib027ac7b40c7a575a76f289faabde9655338865e
Tyler Gunn [Mon, 21 Mar 2016 18:37:08 +0000 (18:37 +0000)]
Merge "Correct naming issues with video calling carrier config items." into nyc-dev
Chris Tate [Mon, 21 Mar 2016 18:31:58 +0000 (18:31 +0000)]
Merge "Fix deadlock when full data backup times out" into nyc-dev
Matt Sarett [Mon, 21 Mar 2016 18:26:18 +0000 (18:26 +0000)]
Merge "Work-around paletted image decoding bug in SDK_JELLYBEAN" into nyc-dev
Tenghui Zhu [Mon, 21 Mar 2016 18:19:52 +0000 (18:19 +0000)]
Merge "API review: Hide ComplexColor and GradientColor" into nyc-dev
Wale Ogunwale [Sat, 19 Mar 2016 03:43:49 +0000 (20:43 -0700)]
Added support to specify animation duration when resizing stack
Needed for sys-ui to control the duration of various Pip transitions.
Bug:
27674339
Change-Id: I7bad27aaa19755a73c594e88b88b56db033e1a45
Phil Burk [Sat, 19 Mar 2016 00:09:22 +0000 (17:09 -0700)]
Audio ENCODING_IEC61937: enforce use of CHANNEL_OUT_STEREO
Prevent developers from using a channelMask that will fail.
Bug:
27721209
Change-Id: I87ad67caedaedf6ed2230165cb1687a2a0b74703
Signed-off-by: Phil Burk <philburk@google.com>
Phil Weaver [Mon, 21 Mar 2016 18:11:25 +0000 (18:11 +0000)]
Merge "Clarify docs about event recycling." into nyc-dev
Teng-Hui Zhu [Thu, 17 Mar 2016 17:38:43 +0000 (10:38 -0700)]
API review: Hide ComplexColor and GradientColor
b/
27532267
Change-Id: I01582e067ec8f4897c34dcec0f7c14700c40e02b
Samuel Tan [Mon, 21 Mar 2016 17:58:38 +0000 (17:58 +0000)]
Merge "Disallow guest user from changing Wifi settings" into nyc-dev
Christopher Tate [Sat, 19 Mar 2016 00:59:29 +0000 (17:59 -0700)]
Fix deadlock when full data backup times out
The code was attempting to let a reported error in the app <-> engine
surface take precedence over apparent success at the engine <-> transport
handoff surface. However, in the case of timeout, this is inappropriate.
It was leading to deadlock because the engine runs free, with socket-closed
as its shutdown signals for determinism. In this case that means that
having accidentally asked it to finish and report the final result, we
locked up forever since the data it was writing dutifully to the engine
was no longer being consumed, and the actual teardown signals were never
sent.
The fix is to properly express the error-state hierarchy: only when the
engine <-> transport layer is not issuing its own abort is the app-data-
moving layer consulted about errors detected at that surface.
Bug
22348852
Change-Id: I8987be0c4f708116dfeb08098d7222241ed317f3
Alan Viverette [Mon, 21 Mar 2016 17:45:33 +0000 (13:45 -0400)]
Account for top and bottom padding in ListPopupWindow
Bug:
27550635
Change-Id: Icbd3190c35dfeb915cfb9f0b08a2f9d2b1307b24
Adrian Roos [Thu, 17 Mar 2016 01:38:58 +0000 (18:38 -0700)]
Don't copy Bitmaps when cloning RemoteViews
Bug:
27385859
Fixes:
27385859
Change-Id: I9f0768b20e6e71d5366eb21df76c984bfe6989b1
Alan Viverette [Mon, 21 Mar 2016 17:35:39 +0000 (13:35 -0400)]
Set drawable callbacks last
Bug:
27554777
Change-Id: I3ef9981bfafcb2a674304c9da10e4f5b1e66f932
Tenghui Zhu [Mon, 21 Mar 2016 17:30:42 +0000 (17:30 +0000)]
Merge "Document the cache bitmap behavior for VD" into nyc-dev
Siyamed Sinir [Thu, 3 Mar 2016 00:02:38 +0000 (16:02 -0800)]
New Linkify.addLinks function with set of known schemes
A new addLinks function is added that accepts a default scheme and a
set of known schemes. Default scheme is applied whenever the link found
does not start with one of the given known schemes.
Moreover, previously JavaDoc for addLinks functions with a single scheme
parameter described that the scheme attribute will be prepended to the
links that do not have 'a' scheme. The code actually checks if the link
starts with the given scheme and prepends if not. JavaDoc updated
accordingly.
Bug:
26985901
Change-Id: I94ea81dcf83ba7a6b6cd47c10fe8fb277964eb15
Ajay Nambi [Mon, 21 Mar 2016 17:06:21 +0000 (17:06 +0000)]
Ril Error codes: Voice related messages
am:
499a8da
* commit '
499a8da1daa82f29eecd59f99721a1cdd52db716':
Ril Error codes: Voice related messages
Phil Weaver [Tue, 8 Mar 2016 21:05:10 +0000 (13:05 -0800)]
Clarify docs about event recycling.
Bug:
27454838
Change-Id: I65d0ced3198dc6ad45b99e4932a0d6e32306cf10
Ajay Nambi [Sat, 19 Mar 2016 16:22:25 +0000 (09:22 -0700)]
Ril Error codes: Voice related messages
This change adds new error codes for messages
related to voice
Bug:
27038563
Change-Id: Id3a212c0b12e1feb26b0836fad3f9399d6dec19c
Paul Mclean [Mon, 21 Mar 2016 16:33:04 +0000 (16:33 +0000)]
Merge "Fix a javadoc @see error" into nyc-dev
Phil Weaver [Mon, 21 Mar 2016 16:28:48 +0000 (16:28 +0000)]
Merge "Fix decision handle accessibility events." into nyc-dev
Abodunrinwa Toki [Mon, 21 Mar 2016 16:12:58 +0000 (16:12 +0000)]
Update A11y IME switch button content description.
Bug:
27676215
Change-Id: I563b0b422e0f3a751db1280be91500b08c0e1ff7
Deepanshu Gupta [Mon, 21 Mar 2016 15:53:13 +0000 (08:53 -0700)]
Add guard around getXmlFileParser() call
Prevents the need to update the LayoutLib API level.
Bug: http://b.android.com/202942
Change-Id: I507239148ab8d6d45406624dba569c8b7197f979
Paul McLean [Mon, 21 Mar 2016 15:50:18 +0000 (09:50 -0600)]
Fix a javadoc @see error
Bug:
26194337
Change-Id: I7945058e0948238e9b2be7e5d8a7dc3ac4d814dc
Tony Mak [Mon, 21 Mar 2016 12:20:41 +0000 (12:20 +0000)]
Show work challenge directly when there is no device lock
The trick is to switch to home stack first and then start the activity
of the targeted task again to trigger the intercepting code.
And back button in the lock screen page brings user to launcher
instead of the work app.
Change-Id: Ic0305dbcb63fec2a8287b12f3e76e70d4268d423
Geoff Mendal [Mon, 21 Mar 2016 14:28:14 +0000 (14:28 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Mon, 21 Mar 2016 14:28:00 +0000 (14:28 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Mon, 21 Mar 2016 14:24:16 +0000 (07:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iccb009c4e690d42ec7d4b01cc749dae3f691cdc5
Auto-generated-cl: translation import
Geoff Mendal [Mon, 21 Mar 2016 14:24:01 +0000 (07:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: I38935299a6318c3ad0af0feebb937d1bd17cffd7
Auto-generated-cl: translation import
Tony Mak [Mon, 21 Mar 2016 14:20:44 +0000 (14:20 +0000)]
Merge "Show launcher when profile is locked immediately" into nyc-dev
Geoff Mendal [Mon, 21 Mar 2016 14:12:16 +0000 (14:12 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Mon, 21 Mar 2016 14:10:50 +0000 (07:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: I032236836b7ce9f766a9f8819a683b9066254737
Auto-generated-cl: translation import
Tony Mak [Mon, 21 Mar 2016 12:07:16 +0000 (12:07 +0000)]
Show launcher when profile is locked immediately
Previously, we show launcher when keyguard is dismissed.
It introduces these issues:
1. There can be no device lock
2. user could take a quick peek of the work app
Current behavior:
1. We now show launcher once the work profile is locked.
2. Lock profile immediately if there is no device lock
3. Add cancel "lockProfileLater" logic
Bug:
27241680
Bug:
27673460
Change-Id: I765aa22d4c8ae5017c1611f5a340a4b33d463b1e
Victor Chang [Mon, 21 Mar 2016 13:08:13 +0000 (13:08 +0000)]
Merge "Api change of DPM.setApplicationRestrictionsManagingPackage()" into nyc-dev
Geoff Mendal [Mon, 21 Mar 2016 12:29:09 +0000 (08:29 -0400)]
Import translations. DO NOT MERGE
Change-Id: I9e707cac6cb9f086cac9bfdd8165d8086d1676e0
Auto-generated-cl: translation import
Diego Perez [Mon, 21 Mar 2016 11:20:13 +0000 (11:20 +0000)]
Merge "Account for parent scroll position" into nyc-dev
Jaewan Kim [Mon, 21 Mar 2016 05:22:33 +0000 (14:22 +0900)]
PIP: Prevent PipOverlayActivity from restarting
PipManager moves the PIPed activity to fullscreen if the activity is
restarted. It's because the activity may be started by the Launcher or
an intent again, but we don't want do so for the PipOverlayActivity.
Bug:
27689029
Change-Id: Icebc09e22e5f5f4650fcdbfdd8c452b7cf23844b
Jaewan Kim [Thu, 17 Mar 2016 09:15:07 +0000 (18:15 +0900)]
Hide system UI activity with FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS in Recents
Bug:
27319061
Change-Id: I41150137cdfac6750f74ba3a72c4872dc6816f1d
Yohei Yukawa [Sun, 20 Mar 2016 22:08:31 +0000 (15:08 -0700)]
Add a comment about ResultReceiver lifetime.
The root cause of memory leak crbug.com/595613 was that Chromium and
WebView have called InputMethodManager#showSoftInput() with
ResultReceiver thta has a strong reference to application logic class
named ContentViewCore. In this particular case, ResultReceiver in
question will be copied to InputMethodManagerService and the current
InputMethodService, which means the original receiver object will not be
collected until the copied objects in other processes are GCed.
Probably there might be several ways to oprimize the performance in
Framework side because the corresponding ResultReceiver objects will be
always handled within the Android Framework unless IME developers
explicitly override the following method.
InputMethodService#onCreateInputMethodInterface()
Anyway, it is probably a bit too late to do such an optimization in N,
and application developers need to support existing versions of Android
anyway. For N, probably making it clear in JavaDoc would be the only
realistic improvement we can do.
Bug:
27658034
Bug:
27727645
Change-Id: I6fc6b88c91a4b1e0a29e94b99a9f0e35605c01b2
Wale Ogunwale [Sat, 19 Mar 2016 21:55:46 +0000 (14:55 -0700)]
Don't finish resolver activity onStop if it is for home intent
Helps avoid a continuous launch cycle if a resolver activity resolving
the home intent is the only activity in the system and the lock screen
is up which will put the activity in the stopped state. The activity
then finished itself onStop, but is then relaunched by the activity
manager since there are no other activities in the system and the
home activity should be present.
Bug:
27674536
Change-Id: Iaca67a00c4a37f70aafd18aedcbd8dba2f561203
Polina Bondarenko [Sat, 19 Mar 2016 19:33:02 +0000 (19:33 +0000)]
Merge "Added skin temperature, thresholds to HardwarePropertiesManager" into nyc-dev
Alan Viverette [Sat, 19 Mar 2016 13:23:02 +0000 (13:23 +0000)]
Merge "Ensure nine-patch uses the best available target density" into nyc-dev
Polina Bondarenko [Tue, 1 Mar 2016 13:39:48 +0000 (14:39 +0100)]
Added skin temperature, thresholds to HardwarePropertiesManager
Bug:
27425887
Change-Id: I13f69ae37906b71d93edbf6bea6daf809d97cfd5
Geoff Mendal [Sat, 19 Mar 2016 10:30:43 +0000 (10:30 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Sat, 19 Mar 2016 10:30:28 +0000 (10:30 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Sat, 19 Mar 2016 10:30:13 +0000 (10:30 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Sat, 19 Mar 2016 10:29:58 +0000 (10:29 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Sat, 19 Mar 2016 10:29:45 +0000 (10:29 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Sat, 19 Mar 2016 10:29:32 +0000 (10:29 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Sat, 19 Mar 2016 10:29:17 +0000 (10:29 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Sat, 19 Mar 2016 10:29:02 +0000 (10:29 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev