OSDN Git Service
Felipe Leme [Wed, 16 Dec 2015 19:55:08 +0000 (19:55 +0000)]
Merge "Changed the action executed when "Take bug report" is selected."
Jason Monk [Sat, 12 Dec 2015 02:39:54 +0000 (21:39 -0500)]
Switch Tuner to support prefs (and some improvements)
Change-Id: I2ef62c0c56d4af69f9f34e1cfd297999d59b7da6
Felipe Leme [Wed, 16 Dec 2015 19:39:11 +0000 (19:39 +0000)]
Merge "Allows users to add details about a bugreport in progress."
Filip Gruszczynski [Wed, 16 Dec 2015 19:38:50 +0000 (19:38 +0000)]
Merge "Fix sysui crash."
Felipe Leme [Fri, 11 Dec 2015 23:07:14 +0000 (15:07 -0800)]
Allows users to add details about a bugreport in progress.
The "bugreport in progress" notification now have a "DETAILS" button
that when clicked opens a dialog window displaying the following fields:
- Name: short name for the bugreport, will be used as part of the
final files (and by default is the timestamp sent by dumpstate)
- Title: a 1-line title for the bugreport, will be used as the subject
in the final message.
- Description: a detailed description for the bug.
The main advantage of such dialog is that it allows users to enter more
info about a bugreport while it's being generated, rather then when the
bugreport is finished (since of the user doesn't remember what the
context was when the problem happened).
BUG:
25794470
BUG:
10676443
Change-Id: I0d1dba2a94ad989e541415a2a59475619a2e3d13
Filip Gruszczynski [Wed, 16 Dec 2015 19:31:12 +0000 (11:31 -0800)]
Fix sysui crash.
Bug:
26228707
Change-Id: I34e2362fecda06380e4640483a71365311f99d57
John Reck [Wed, 16 Dec 2015 19:09:12 +0000 (19:09 +0000)]
Merge "resolve merge conflicts of
04ce46db64 to "
John Reck [Wed, 16 Dec 2015 19:07:53 +0000 (11:07 -0800)]
resolve merge conflicts of
04ce46db64 to master.
Change-Id: I935bb47718f0e7d5fb48945dd8de6e28dac136e5
Alan Viverette [Wed, 16 Dec 2015 18:56:08 +0000 (18:56 +0000)]
Merge "Check for null MenuHelper before setting presenter callback"
John Reck [Wed, 16 Dec 2015 18:44:57 +0000 (18:44 +0000)]
Merge "libhwui: make setSurface asynchronous"
am:
738a5d4f18
* commit '
738a5d4f18e69c03700b77af0ea7e2a101da2c34':
libhwui: make setSurface asynchronous
Winson Chung [Wed, 16 Dec 2015 18:33:47 +0000 (18:33 +0000)]
Merge "Adding catch for b/
26221779"
Derek Sollenberger [Wed, 16 Dec 2015 18:32:39 +0000 (18:32 +0000)]
Merge "Remove onDrawSprite API as it is no longer exposed via SkCanvas"
John Reck [Wed, 16 Dec 2015 18:27:24 +0000 (18:27 +0000)]
Merge "libhwui: make setSurface asynchronous"
Chris Craik [Wed, 16 Dec 2015 18:25:35 +0000 (18:25 +0000)]
Merge "Allow RT animation of new renderer"
Winson Chung [Wed, 16 Dec 2015 18:18:43 +0000 (13:18 -0500)]
Adding catch for b/
26221779
Change-Id: Id0cf455cd65bf5b202a6249b0b51351addb0bd17
Chris Craik [Wed, 16 Dec 2015 03:17:32 +0000 (19:17 -0800)]
Allow RT animation of new renderer
Change-Id: I60136dc080dc4fd853ac8c3d37fefa85da1181df
Andrei Stingaceanu [Thu, 26 Nov 2015 15:26:28 +0000 (15:26 +0000)]
Wire call to suspend a package
Adds APIs in DevicePolicyManager and PackageManager for allowing
a device admin to suspend a package. PackageManagerService sets
or unsets a new PackageUserState 'suspended' setting. Terminal
command to suspend/unsuspend has been added via
PackageManagerShellCommand (as root).
Next steps:
* use the new 'suspended' setting for denying access to start app
(probably in ActivityStackSupervisor)
* broadcast a PACKAGE_(UN)SUSPENDED intent for launchers to pick up
* remove app from recents (go further and kill it if it is running)
* erase existing notifications for this app
Bug:
22776576
Change-Id: I718b3498f6a53cc0c6fdfb6d15031e53ddca4353
Jeff Sharkey [Wed, 16 Dec 2015 17:57:17 +0000 (17:57 +0000)]
Merge "Relax isUserRunning() when asking about self."
Geoff Mendal [Wed, 16 Dec 2015 17:36:36 +0000 (17:36 +0000)]
Merge "Import translations. DO NOT MERGE"
Jeff Sharkey [Wed, 16 Dec 2015 17:22:45 +0000 (10:22 -0700)]
Relax isUserRunning() when asking about self.
When a caller is asking about locked state of themselves, don't
require the INTERACT_ACROSS_USERS permission.
Bug:
26178790
Change-Id: I0f02ebfed87b2e1cddc1cb044a9f04272f85483b
Jason Monk [Wed, 16 Dec 2015 17:17:13 +0000 (17:17 +0000)]
Merge "Fix bootloops from new zen changed broadcast"
Jason Monk [Wed, 16 Dec 2015 17:06:51 +0000 (12:06 -0500)]
Fix bootloops from new zen changed broadcast
Bug:
26226057
Change-Id: Ie1e0cbfdbb44c6eea3dafed777fe8ad49ca696a5
Geoff Mendal [Wed, 16 Dec 2015 17:03:59 +0000 (18:03 +0100)]
Import translations. DO NOT MERGE
Change-Id: Idc2d12d6616f6b406b078a5662fe864f616d29e2
Auto-generated-cl: translation import
Derek Sollenberger [Wed, 16 Dec 2015 16:46:50 +0000 (11:46 -0500)]
Remove onDrawSprite API as it is no longer exposed via SkCanvas
Change-Id: Id6f0bb7a9b4eaad0d0442d4ab4212f6a56070c66
Geoff Mendal [Wed, 16 Dec 2015 16:45:52 +0000 (16:45 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
d0dd157ade -s ours am:
4893042569 -s ours am:
1d81716044 -s ours
am:
079a994976 -s ours
* commit '
079a9949765dad88c901f3c7ab0deaa3abba0925':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 16:43:58 +0000 (16:43 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
8b4b230174 -s ours am:
82ce2a6cdb -s ours am:
86c9eb83ce -s ours
am:
edb3565ba9 -s ours
* commit '
edb3565ba93e4990249327b8def457db50e5207e':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 16:42:28 +0000 (16:42 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
10bc1c7000 -s ours am:
c8ddc96f01 -s ours am:
5b1b0a8224 -s ours
am:
00c44332d9 -s ours
* commit '
00c44332d91b375892d5521c41f4da050775b212':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 16:41:05 +0000 (16:41 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
df5dd062a0 -s ours am:
a32b362f00 -s ours am:
4cab51620b -s ours
am:
ae767ad74a -s ours
* commit '
ae767ad74a254cf51d6d297e5f81c82f4801e738':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 16:39:44 +0000 (16:39 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
531eb5b484 -s ours am:
57a89670cb -s ours am:
b16da9aef2 -s ours
am:
67da1e8dd3 -s ours
* commit '
67da1e8dd3376bd208554eba38d114485cab402d':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 16:38:24 +0000 (16:38 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
327d917865 -s ours am:
7babe8de9e -s ours am:
0750798334 -s ours
am:
3b290555ef -s ours
* commit '
3b290555ef9d92949a0e5339c2d9cb7ea3e82b35':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 16:37:03 +0000 (16:37 +0000)]
Import translations. DO NOT MERGE am:
22dea4e16f -s ours am:
d8004c03d2 -s ours am:
b295f8112c -s ours
am:
8cd03afa2b -s ours
* commit '
8cd03afa2bc9725f67922ac0f19059cbd841dcba':
Import translations. DO NOT MERGE
Jeff Sharkey [Wed, 16 Dec 2015 16:25:11 +0000 (16:25 +0000)]
Merge "Roll back some broadcasts."
Jeff Sharkey [Wed, 16 Dec 2015 16:23:58 +0000 (09:23 -0700)]
Roll back some broadcasts.
Bug:
26219971,
26219772
Change-Id: Ic45691419f8fcd1b472a380f09408caf29d3c13d
Matt Sarett [Wed, 16 Dec 2015 16:05:42 +0000 (16:05 +0000)]
Merge changes from topic 'BitmapFactory'
* changes:
Allow SkAndroidCodec to compute the decode color type and alpha type
Modify BitmapFactory to use SkAndroidCodec
Make NinePatchPeeker inherit from SkPngChunkReader
Wale Ogunwale [Wed, 16 Dec 2015 15:32:27 +0000 (15:32 +0000)]
Merge "Only persist task bounds for freeform tasks."
Winson Chung [Wed, 16 Dec 2015 15:15:57 +0000 (15:15 +0000)]
Merge changes I32cbc333,I34926215
* changes:
Fixing long compare.
Cancelling window transition when starting focus animation.
Alan Viverette [Wed, 16 Dec 2015 14:56:37 +0000 (09:56 -0500)]
Check for null MenuHelper before setting presenter callback
Bug:
26219569
Change-Id: Ia19a1304aa10dac52b89d0ee85acdb5671a15777
Geoff Mendal [Wed, 16 Dec 2015 14:46:23 +0000 (14:46 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 16 Dec 2015 14:42:42 +0000 (14:42 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 16 Dec 2015 14:38:30 +0000 (14:38 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 16 Dec 2015 14:37:24 +0000 (14:37 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 16 Dec 2015 14:25:52 +0000 (14:25 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 16 Dec 2015 14:24:38 +0000 (14:24 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 16 Dec 2015 14:22:22 +0000 (14:22 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 16 Dec 2015 14:08:30 +0000 (06:08 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8dc68f5b6e8579613e61c5a060a9d2fff5729cef
Auto-generated-cl: translation import
Geoff Mendal [Wed, 16 Dec 2015 14:06:08 +0000 (06:06 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5470c5cea8ef18eed3baf21e7742d384e50bfed8
Auto-generated-cl: translation import
Geoff Mendal [Wed, 16 Dec 2015 14:03:13 +0000 (06:03 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8a5e7004c7370fe174d1af2a49b365bdd35c03f9
Auto-generated-cl: translation import
Geoff Mendal [Wed, 16 Dec 2015 14:02:07 +0000 (06:02 -0800)]
Import translations. DO NOT MERGE
Change-Id: Idf26135155e3dc2873aa5f4de0f67fb56b8a971f
Auto-generated-cl: translation import
Geoff Mendal [Wed, 16 Dec 2015 13:54:23 +0000 (13:54 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 16 Dec 2015 13:51:35 +0000 (13:51 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 16 Dec 2015 13:51:29 +0000 (05:51 -0800)]
Import translations. DO NOT MERGE
Change-Id: I310f81e9ec34340edf42d9f5c0c6161b75b861a8
Auto-generated-cl: translation import
Geoff Mendal [Wed, 16 Dec 2015 13:48:19 +0000 (05:48 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ife17cc8816a60ab0966694d1e4212b70f2340ec7
Auto-generated-cl: translation import
Geoff Mendal [Wed, 16 Dec 2015 13:47:37 +0000 (13:47 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 16 Dec 2015 13:45:15 +0000 (05:45 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id4a6dcb82bd702595378f563a79fd4088faa6b73
Auto-generated-cl: translation import
Geoff Mendal [Wed, 16 Dec 2015 13:45:09 +0000 (13:45 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 16 Dec 2015 13:37:47 +0000 (13:37 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 16 Dec 2015 13:37:22 +0000 (05:37 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8e196e353460b6f05dbe69500c6373224857736f
Auto-generated-cl: translation import
Geoff Mendal [Wed, 16 Dec 2015 13:35:04 +0000 (13:35 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 16 Dec 2015 13:34:05 +0000 (05:34 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5bc6d48d53fb7c0971c2a84e1c20639a2449026c
Auto-generated-cl: translation import
Geoff Mendal [Wed, 16 Dec 2015 13:31:09 +0000 (05:31 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ieddc3162078822f693c29b9a3df2b4e9577fbca9
Auto-generated-cl: translation import
Geoff Mendal [Wed, 16 Dec 2015 13:28:12 +0000 (05:28 -0800)]
Import translations. DO NOT MERGE
Change-Id: I35c5aad9721b849884eff1945406f0ad7af6b0a6
Auto-generated-cl: translation import
Geoff Mendal [Wed, 16 Dec 2015 13:22:25 +0000 (05:22 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1dbbcb24ebd0b50cdcd4248e8ed4bd2d439143be
Auto-generated-cl: translation import
Geoff Mendal [Wed, 16 Dec 2015 13:19:28 +0000 (05:19 -0800)]
Import translations. DO NOT MERGE
Change-Id: I84628317971d176fc8dddfbb9153c48e83c52dbb
Auto-generated-cl: translation import
Geoff Mendal [Wed, 16 Dec 2015 13:16:21 +0000 (05:16 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iaed1007dbbffff53274502c8fca70ca30dbc6a83
Auto-generated-cl: translation import
Esteban Talavera [Wed, 16 Dec 2015 10:44:12 +0000 (10:44 +0000)]
Merge "Only system can set application restrictions via UserManager"
Geoff Mendal [Wed, 16 Dec 2015 05:26:09 +0000 (05:26 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
d0dd157ade -s ours am:
4893042569 -s ours
am:
1d81716044 -s ours
* commit '
1d817160447901754e23c5cac841480ea8de18da':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 05:24:41 +0000 (05:24 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
8b4b230174 -s ours am:
82ce2a6cdb -s ours
am:
86c9eb83ce -s ours
* commit '
86c9eb83ce4cdedee531fa05647c9c4025abb293':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 05:18:39 +0000 (05:18 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
d0dd157ade -s ours
am:
4893042569 -s ours
* commit '
489304256944d6d170ab4dfd30a3e53efd994d2b':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 05:17:12 +0000 (05:17 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
8b4b230174 -s ours
am:
82ce2a6cdb -s ours
* commit '
82ce2a6cdbf0eedfca0ef3f2716a09e10d159202':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 05:13:21 +0000 (21:13 -0800)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
10bc1c7000 -s ours am:
c8ddc96f01 -s ours
am:
5b1b0a8224 -s ours
* commit '
5b1b0a82241d9b9fa033d5d03c0e49d729cd0958':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 05:11:07 +0000 (05:11 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
d0dd157ade -s ours
* commit '
d0dd157ade7536286e32ecbb271d3561bd7b5e93':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 05:09:37 +0000 (05:09 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
8b4b230174 -s ours
* commit '
8b4b230174228fd6313ae493a44cc7dc67c6bfc4':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 05:05:55 +0000 (05:05 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
10bc1c7000 -s ours
am:
c8ddc96f01 -s ours
* commit '
c8ddc96f01b52b4aab1741fc033076dd46b076f3':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 05:05:18 +0000 (05:05 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 16 Dec 2015 05:03:50 +0000 (21:03 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia8ab8097f7b82ed5fb344351035535c5b3b0690d
Auto-generated-cl: translation import
Geoff Mendal [Wed, 16 Dec 2015 05:03:46 +0000 (05:03 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
df5dd062a0 -s ours am:
a32b362f00 -s ours
am:
4cab51620b -s ours
* commit '
4cab51620b7a580e7a54599c03d4b88e8f868553':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 05:02:26 +0000 (05:02 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 16 Dec 2015 05:02:15 +0000 (05:02 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
531eb5b484 -s ours am:
57a89670cb -s ours
am:
b16da9aef2 -s ours
* commit '
b16da9aef296f0b762e1934e505bb89a7f715f0b':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 05:00:49 +0000 (21:00 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ifbe7e97f2a1fe1b688642a8179c0e184d69ba3cb
Auto-generated-cl: translation import
Geoff Mendal [Wed, 16 Dec 2015 04:58:38 +0000 (04:58 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
10bc1c7000 -s ours
* commit '
10bc1c7000e1c9d232a1074e8788ed75ee4c2117':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 04:54:40 +0000 (20:54 -0800)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
327d917865 -s ours am:
7babe8de9e -s ours
am:
0750798334 -s ours
* commit '
07507983347a3b0ff9cdd60eb408839e1ed4895f':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 04:54:38 +0000 (04:54 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
df5dd062a0 -s ours
am:
a32b362f00 -s ours
* commit '
a32b362f00338421789679dcb5ddd3bd3c2c6711':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 04:53:02 +0000 (20:53 -0800)]
Import translations. DO NOT MERGE am:
22dea4e16f -s ours am:
d8004c03d2 -s ours
am:
b295f8112c -s ours
* commit '
b295f8112c82efc1d9d162855dbcbde32ddb839d':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 04:53:01 +0000 (04:53 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
531eb5b484 -s ours
am:
57a89670cb -s ours
* commit '
57a89670cbe157cf8a99a6a0f0a10b37aac2b8ee':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 04:49:00 +0000 (04:49 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 16 Dec 2015 04:45:33 +0000 (20:45 -0800)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
327d917865 -s ours
am:
7babe8de9e -s ours
* commit '
7babe8de9eb51c5c23c9d3257314aa374112d550':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 04:45:33 +0000 (20:45 -0800)]
Import translations. DO NOT MERGE
Change-Id: Idc7e685457dc0bc2da4df2bd10ac2187d64fa00f
Auto-generated-cl: translation import
Geoff Mendal [Wed, 16 Dec 2015 04:45:32 +0000 (04:45 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
df5dd062a0 -s ours
* commit '
df5dd062a0016ff66239e4507da07a90a83063dc':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 04:43:18 +0000 (20:43 -0800)]
Import translations. DO NOT MERGE am:
22dea4e16f -s ours
am:
d8004c03d2 -s ours
* commit '
d8004c03d2c05d84e38ce3a5da88fd4b2c4e9681':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 04:43:18 +0000 (04:43 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
531eb5b484 -s ours
* commit '
531eb5b484765888aa0dd969645593b50144c201':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 04:36:13 +0000 (04:36 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 16 Dec 2015 04:35:34 +0000 (20:35 -0800)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
327d917865 -s ours
* commit '
327d917865331d1b6823495e1e4ba43930caaacb':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 04:34:53 +0000 (20:34 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic3c47d16450ddb80c815369cf01bb63be1f73a88
Auto-generated-cl: translation import
Geoff Mendal [Wed, 16 Dec 2015 04:34:26 +0000 (04:34 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 16 Dec 2015 04:33:27 +0000 (20:33 -0800)]
Import translations. DO NOT MERGE
am:
22dea4e16f -s ours
* commit '
22dea4e16f9a32eb4693829b59462c32dda3f45c':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 04:29:48 +0000 (20:29 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie93a6af2b483228b5797bdb018ac8accc7ef54ed
Auto-generated-cl: translation import
Geoff Mendal [Wed, 16 Dec 2015 04:26:04 +0000 (04:26 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 16 Dec 2015 04:21:26 +0000 (20:21 -0800)]
Import translations. DO NOT MERGE
Change-Id: I28f308a8339779f14ccf90581665624317afb4d3
Auto-generated-cl: translation import
Geoff Mendal [Wed, 16 Dec 2015 04:18:32 +0000 (20:18 -0800)]
Import translations. DO NOT MERGE
Change-Id: I72a2242dff4a0d0c661bcdbc2ed2cca8dc38a89e
Auto-generated-cl: translation import
Jun Mukai [Wed, 16 Dec 2015 02:11:56 +0000 (02:11 +0000)]
Merge "Exclude accessing settings from PointerIcon."