OSDN Git Service
Clara Bayarri [Tue, 17 Mar 2015 15:43:50 +0000 (15:43 +0000)]
Merge "Floating toolbars: Add content rect related methods to API"
Yohei Yukawa [Tue, 17 Mar 2015 15:16:41 +0000 (15:16 +0000)]
Merge "Remove deprecated hidden public methods from InputMethodUtils."
Deepanshu Gupta [Tue, 17 Mar 2015 14:53:17 +0000 (14:53 +0000)]
am
199a70f1: am
576801ff: am
842eee9f: am
1f9a26af: am
158c08bc: am
ada85905: Fix AppCompat action bar theming.
* commit '
199a70f1820c38a9f1db1697ad91c4f5f07d00aa':
Fix AppCompat action bar theming.
Deepanshu Gupta [Tue, 17 Mar 2015 14:53:10 +0000 (14:53 +0000)]
am
0f8c9d1d: am
a5be9a7d: am
38467b5f: am
9a00f1c8: am
79f7fce7: am
2e4d9324: Fix NoActionBar themes rendering.
* commit '
0f8c9d1df28ed10b1c9013ddd315b306868e349d':
Fix NoActionBar themes rendering.
Mathieu Chartier [Tue, 17 Mar 2015 14:47:24 +0000 (14:47 +0000)]
am
5ec7c78d: am
008ec61e: Merge "Change jit properties to be debug properties"
* commit '
5ec7c78d52a5a01ed1755ad8b8e486e4c6f05a93':
Change jit properties to be debug properties
Deepanshu Gupta [Tue, 17 Mar 2015 14:44:52 +0000 (14:44 +0000)]
am
576801ff: am
842eee9f: am
1f9a26af: am
158c08bc: am
ada85905: Fix AppCompat action bar theming.
* commit '
576801ff82a85c4de19404dfe364eef7184b84e0':
Fix AppCompat action bar theming.
Deepanshu Gupta [Tue, 17 Mar 2015 14:44:46 +0000 (14:44 +0000)]
am
a5be9a7d: am
38467b5f: am
9a00f1c8: am
79f7fce7: am
2e4d9324: Fix NoActionBar themes rendering.
* commit '
a5be9a7d2d2cbcd3892fc916c9a944745024881d':
Fix NoActionBar themes rendering.
Mathieu Chartier [Tue, 17 Mar 2015 14:36:50 +0000 (14:36 +0000)]
am
008ec61e: Merge "Change jit properties to be debug properties"
* commit '
008ec61e0ccff0ca92cc0d2b5b73a1d620d3aad3':
Change jit properties to be debug properties
Deepanshu Gupta [Tue, 17 Mar 2015 14:36:05 +0000 (14:36 +0000)]
am
842eee9f: am
1f9a26af: am
158c08bc: am
ada85905: Fix AppCompat action bar theming.
* commit '
842eee9f816a2e35bf3c9ce6c14cd5e43684265b':
Fix AppCompat action bar theming.
Deepanshu Gupta [Tue, 17 Mar 2015 14:35:58 +0000 (14:35 +0000)]
am
38467b5f: am
9a00f1c8: am
79f7fce7: am
2e4d9324: Fix NoActionBar themes rendering.
* commit '
38467b5fbbc09ad05624454f735d27ada25565c8':
Fix NoActionBar themes rendering.
Andreas Gampe [Tue, 17 Mar 2015 14:29:50 +0000 (14:29 +0000)]
am
14e436ae: am
345a8f69: Merge "Frameworks/base: Fix a comparison"
* commit '
14e436aec45e7d83c2b3695c07d9740b9fd7f043':
Frameworks/base: Fix a comparison
Deepanshu Gupta [Tue, 17 Mar 2015 14:28:37 +0000 (14:28 +0000)]
am
1f9a26af: am
158c08bc: am
ada85905: Fix AppCompat action bar theming.
* commit '
1f9a26af95abba385b612c734d1d5e32d9e3f363':
Fix AppCompat action bar theming.
Deepanshu Gupta [Tue, 17 Mar 2015 14:28:33 +0000 (14:28 +0000)]
am
9a00f1c8: am
79f7fce7: am
2e4d9324: Fix NoActionBar themes rendering.
* commit '
9a00f1c84b7a7936a12415a08604ac8fb98ec5ea':
Fix NoActionBar themes rendering.
Deepanshu Gupta [Tue, 17 Mar 2015 14:16:50 +0000 (14:16 +0000)]
am
158c08bc: am
ada85905: Fix AppCompat action bar theming.
* commit '
158c08bcf1cd0bc702748ee2a4cf6aa259c26147':
Fix AppCompat action bar theming.
Deepanshu Gupta [Tue, 17 Mar 2015 14:16:42 +0000 (14:16 +0000)]
am
79f7fce7: am
2e4d9324: Fix NoActionBar themes rendering.
* commit '
79f7fce7a49e7b7cd414ff5c3fdb5cbaae45c1f1':
Fix NoActionBar themes rendering.
Yohei Yukawa [Fri, 20 Feb 2015 18:00:22 +0000 (03:00 +0900)]
Remove deprecated hidden public methods from InputMethodUtils.
This is a follow up CL for a recent attempt to minimize
the number of default enabled IMEs.
- part1: I831502db502f4073c9c2f50ce7705a4e45e2e1e3
- part2: Ife93d909fb8a24471c425c903e2b7048826e17a3
- part3: I6571d464a46453934f0a8f5e79018a67a9a3c845
- part4: I871ccda787eb0f1099ba3574356c1da4b33681f3
This CL removes following deprecated hidden public methods
from InputMethodUtils as planned.
- isSystemImeThatHasEnglishKeyboardSubtype(InputMethodInfo)
- isValidSystemDefaultIme(boolean, InputMethodInfo, Context)
- containsSubtypeOf(InputMethodInfo, String, String)
This is a pure code refactoring with preserving the current
logic. Hence no behavior change is intended.
Change-Id: I1ff994cbbdef83e1e907a0d88aa9ae09d45263b4
Christopher Tate [Tue, 17 Mar 2015 02:17:24 +0000 (02:17 +0000)]
Merge "Back up / restore spell checker configuration"
Christopher Tate [Tue, 17 Mar 2015 02:13:10 +0000 (02:13 +0000)]
Merge "Merge restored accessibility enable state, don't overwrite"
Christopher Tate [Tue, 17 Mar 2015 02:12:11 +0000 (02:12 +0000)]
Merge "Notification listener backup & restore"
Mathieu Chartier [Tue, 17 Mar 2015 02:04:33 +0000 (02:04 +0000)]
Merge "Change jit properties to be debug properties"
Vishwath Mohan [Tue, 17 Mar 2015 01:52:24 +0000 (01:52 +0000)]
Merge "Handle malformed manifests in printXMLBlock"
Christopher Tate [Tue, 17 Mar 2015 01:29:42 +0000 (18:29 -0700)]
Back up / restore spell checker configuration
Bug
19779845
Change-Id: Ib8382f0296f0726b64494d3b1fd8237e13adb540
Clara Bayarri [Wed, 25 Feb 2015 14:44:34 +0000 (14:44 +0000)]
Floating toolbars: Add content rect related methods to API
This CL adds the ActionMode.Callback2 abstract class and the rect
invalidate method needed to add the content rect API for Floating
Toolbars. It also extends the existing ActionModeCallbackWrapper in
DecorView to handle the case when ActionMode.Callback is provided
instead of Callback2, falling back to a default implementation.
Change-Id: Ia918ddfcfdf73d0e4cafd24c4a0573245d497cfe
Christopher Tate [Mon, 16 Mar 2015 23:55:14 +0000 (16:55 -0700)]
Merge restored accessibility enable state, don't overwrite
We do not want to accidentally disable the user's currently-enabled
accessibility service(s); presumably they turned them on during
setup for a reason. We now merge the prior + current states rather
than simply replacing the current state with the former.
Bug
19427367
Change-Id: I96eb47df57318c88066c5da6862f23f656639148
Andreas Gampe [Tue, 17 Mar 2015 00:25:04 +0000 (00:25 +0000)]
am
345a8f69: Merge "Frameworks/base: Fix a comparison"
* commit '
345a8f69ea2acd6d3ecf4c200cb33e8037f8798c':
Frameworks/base: Fix a comparison
Deepanshu Gupta [Tue, 17 Mar 2015 00:21:02 +0000 (00:21 +0000)]
am
ada85905: Fix AppCompat action bar theming.
* commit '
ada8590547348b77d8cbd56abdb8fadb3e72c015':
Fix AppCompat action bar theming.
Deepanshu Gupta [Tue, 17 Mar 2015 00:20:58 +0000 (00:20 +0000)]
am
2e4d9324: Fix NoActionBar themes rendering.
* commit '
2e4d93245764a1c1d7515361ddbb8fc1665f814e':
Fix NoActionBar themes rendering.
Andreas Gampe [Tue, 17 Mar 2015 00:12:24 +0000 (00:12 +0000)]
Merge "Frameworks/base: Fix a comparison"
Dongwon Kang [Mon, 16 Mar 2015 23:58:03 +0000 (23:58 +0000)]
Merge "TIF: Add getDescription() method to TvTrackInfo."
Christopher Tate [Tue, 17 Feb 2015 20:15:25 +0000 (12:15 -0800)]
Notification listener backup & restore
We now back up & restore the set of enabled notification listeners. Post-
restore, a listener that had been enabled on the ancestral device will be
enabled on the current device as soon as it's installed, matching the
user's previous configuration. After this has happened the enable/disable
state for that app is not "sticky"; disabling it again will work as
expected.
The infrastructure for accomplishing this is general: it can be leveraged
by any ManagedServices derivative. There's a bit of extra wiring in the
settings provider to support the restore-time information flow as well.
This is because ManagedServices -- like many other parts of the system --
monitors writes to the settings provider and does work in response to new
writes of the elements that it cares about. Unfortunately this means that
there is no way to use the BackupAgent's restoreFinished() hook to post-
process the restored data: by the time it is run, the ManagedService's
observers have already executed and culled any unknown components from
the description that was just pushed into settings.
As of this patch, the settings provider's restore logic knows that a
particular settings element will require a message to interested observers
about the restore-driven change. The message is delivered as a broadcast,
and is sent after the new value has been committed to the settings db.
Adding other system ManagedService handling that parallels this will only
require adding a new corresponding entry to the table of individual settings
for which the relevant "this settings element is being restored" broadcast
is sent, found in SettingsHelper.
(It isn't sent for all settings elements because very few settings elements
have semantics that require it; 3rd party code won't be running yet during
platform restore anyway; and sending up to hundreds of broadcasts during
setup & restore is far from ideal.)
Bug
19254153
Change-Id: Ib8268c6cb273862a3ee089d2764f3bff4a299103
Mathieu Chartier [Mon, 16 Mar 2015 23:10:52 +0000 (16:10 -0700)]
Change jit properties to be debug properties
Bug:
19735273
Change-Id: I266cf447a7af0595366bf89109d2823094f5cf41
Mike Lockwood [Mon, 16 Mar 2015 23:20:10 +0000 (23:20 +0000)]
Merge "MidiDeviceInfo: Fix NPE for devices with no port names"
Tor Norbye [Mon, 16 Mar 2015 23:03:39 +0000 (23:03 +0000)]
Merge "Add @TransitionRes for transition resource integers"
Mike Lockwood [Mon, 16 Mar 2015 23:03:17 +0000 (16:03 -0700)]
MidiDeviceInfo: Fix NPE for devices with no port names
Change-Id: I703709f84b6b1951b67918c9762bb84a142d855c
Jeff Brown [Mon, 16 Mar 2015 22:53:21 +0000 (22:53 +0000)]
Merge "Reduce SQLite logspam."
Jeff Brown [Mon, 16 Mar 2015 22:21:45 +0000 (15:21 -0700)]
Reduce SQLite logspam.
Suppress "automatic index on" warnings unless verbose logging is enabled.
Also suppress any notices.
Bug:
19773765
Change-Id: I4a4160e81e2cccf5119770182a64d6bbd9cc3505
Selim Cinek [Mon, 16 Mar 2015 22:29:23 +0000 (22:29 +0000)]
Merge "Fixed a bug where HUNs would not dissappear"
Adam Lesinski [Mon, 16 Mar 2015 22:16:03 +0000 (22:16 +0000)]
Merge "Only attempt to load .apk files in AssetManager"
Adam Lesinski [Mon, 16 Mar 2015 22:10:56 +0000 (15:10 -0700)]
Only attempt to load .apk files in AssetManager
This will reduce the number of files we must open
and reduce log spam.
Change-Id: I595ba4a5ea8466e530915d6ae4cf1d3e3dba15ef
Dianne Hackborn [Mon, 16 Mar 2015 22:01:49 +0000 (22:01 +0000)]
Merge "Add new voice request for picking from a list."
Andreas Gampe [Mon, 16 Mar 2015 21:58:39 +0000 (21:58 +0000)]
am
7f95a1bc: am
5eb42122: Merge "Frameworks/base: Force long computation"
* commit '
7f95a1bc3271318d7f08f19426be24b17186f9f0':
Frameworks/base: Force long computation
Tor Norbye [Mon, 16 Mar 2015 21:20:30 +0000 (21:20 +0000)]
Merge "Add resource type annotations to some APIs"
Andreas Gampe [Mon, 16 Mar 2015 20:49:12 +0000 (20:49 +0000)]
am
5eb42122: Merge "Frameworks/base: Force long computation"
* commit '
5eb421221bcade4f5715d42843346f7d3c733547':
Frameworks/base: Force long computation
Andreas Gampe [Mon, 16 Mar 2015 20:36:04 +0000 (20:36 +0000)]
Merge "Frameworks/base: Force long computation"
Selim Cinek [Mon, 16 Mar 2015 20:34:43 +0000 (13:34 -0700)]
Fixed a bug where HUNs would not dissappear
Bug:
19626170
Change-Id: Iadc4bd6b2bfc85b3da67e1e87cf1514cfcb269bb
Andreas Gampe [Mon, 16 Mar 2015 20:26:43 +0000 (20:26 +0000)]
am
e6857531: am
f3e581c9: Merge "Frameworks/base: Check before foreach in Script"
* commit '
e685753136ee8e88212ad95b24284a153c86a0c1':
Frameworks/base: Check before foreach in Script
Andreas Gampe [Mon, 16 Mar 2015 20:26:32 +0000 (20:26 +0000)]
am
c3228a9d: am
3d33314e: Merge "Frameworks/base: Use equals for Integer comparison"
* commit '
c3228a9d400bcacd15fbbdf136ee1f9cf56de2d0':
Frameworks/base: Use equals for Integer comparison
Derek Sollenberger [Mon, 16 Mar 2015 19:40:07 +0000 (19:40 +0000)]
Merge "Add conic support to HWUI path tessellator."
Andreas Gampe [Mon, 16 Mar 2015 19:31:17 +0000 (19:31 +0000)]
am
f3e581c9: Merge "Frameworks/base: Check before foreach in Script"
* commit '
f3e581c99f33ae1857fa52b11cf9bfbfe400c553':
Frameworks/base: Check before foreach in Script
Derek Sollenberger [Mon, 16 Mar 2015 18:35:55 +0000 (14:35 -0400)]
Add conic support to HWUI path tessellator.
bug:
19732872
Change-Id: Ic3ae46f746325468ab972c9daf829099165eb596
Andreas Gampe [Mon, 16 Mar 2015 19:22:00 +0000 (19:22 +0000)]
am
3d33314e: Merge "Frameworks/base: Use equals for Integer comparison"
* commit '
3d33314e03c24758e3b3bbd9e23e40199a259b80':
Frameworks/base: Use equals for Integer comparison
Andreas Gampe [Mon, 16 Mar 2015 19:17:44 +0000 (19:17 +0000)]
Merge "Frameworks/base: Check before foreach in Script"
Andreas Gampe [Mon, 16 Mar 2015 19:10:39 +0000 (19:10 +0000)]
Merge "Frameworks/base: Use equals for Integer comparison"
Deepanshu Gupta [Fri, 13 Mar 2015 18:06:47 +0000 (11:06 -0700)]
Fix AppCompat action bar theming.
Use themed context to inflate the action bar when AppCompat is used.
Also fix minor issues exposed as a result.
- Set project callback when LayoutInflater is created by
LayoutInflater.from(context).
- Remove duplication of code to get base context from context wrapper.
Bug: http://b.android.com/159711
Change-Id: I379ba2ba71c0ef547460987c3aa5db521c7de967
Eric Laurent [Mon, 16 Mar 2015 18:30:21 +0000 (18:30 +0000)]
Merge "broadcast radio API"
Eric Laurent [Mon, 16 Mar 2015 18:29:19 +0000 (18:29 +0000)]
Merge "broadcast radio JNI."
Dianne Hackborn [Sat, 14 Mar 2015 01:02:54 +0000 (18:02 -0700)]
Add new voice request for picking from a list.
Also add API for voice interaction service to control
whether the system should hold a wake lock while it is
working with an activity (and actually *do* hold a wake
lock while doing so, duh!).
And while in there, clean up the launching wake lock to
correctly give blame to the app that is launching.
Change-Id: I7cc4d566b80f59fe0a9ac51ae9bbb7188a01f433
Andreas Gampe [Mon, 16 Mar 2015 18:11:47 +0000 (18:11 +0000)]
am
8af305f1: am
6878ee57: Merge "Revert "Frameworks/base: Fix a constructor""
* commit '
8af305f17ff0d4b84e5a71777de788e9a6ae2780':
Revert "Frameworks/base: Fix a constructor"
Andreas Gampe [Mon, 16 Mar 2015 18:03:17 +0000 (18:03 +0000)]
am
6878ee57: Merge "Revert "Frameworks/base: Fix a constructor""
* commit '
6878ee57b438b063fcc09a19a04fba92e113c1d2':
Revert "Frameworks/base: Fix a constructor"
Selim Cinek [Mon, 16 Mar 2015 18:00:59 +0000 (18:00 +0000)]
Merge "Added more anti-falsing logic"
Selim Cinek [Thu, 27 Nov 2014 13:06:04 +0000 (14:06 +0100)]
Added more anti-falsing logic
We now discard unlock attempts with multiple pointers.
Bug:
18544191
Change-Id: Id2e7bca0353b3f85aa193f6a5c793b93ca0776e3
Andreas Gampe [Mon, 16 Mar 2015 17:51:14 +0000 (17:51 +0000)]
Merge "Revert "Frameworks/base: Fix a constructor""
Andreas Gampe [Mon, 16 Mar 2015 17:51:01 +0000 (17:51 +0000)]
Revert "Frameworks/base: Fix a constructor"
The constructor was public API, doh. Gotta do this differently.
This reverts commit
33c5b2a62f3e62382c41e24c6b527119978816a0.
Change-Id: Iadca87fe6a8866a8bd9d6f2a91578ec0d4c44691
Andreas Gampe [Mon, 16 Mar 2015 17:20:12 +0000 (17:20 +0000)]
am
8e176d39: am
007e207b: Merge "Frameworks/base: Fix null-pointer check"
* commit '
8e176d396d393af90ffe288d849e95ff40aa2b23':
Frameworks/base: Fix null-pointer check
Andreas Gampe [Mon, 16 Mar 2015 17:13:26 +0000 (17:13 +0000)]
am
19279ec0: am
d61cbf9a: Merge "Frameworks/base: Fix a constructor"
* commit '
19279ec04845b2a47b90240c9d47bf8fb5ece464':
Frameworks/base: Fix a constructor
Andreas Gampe [Mon, 16 Mar 2015 17:12:57 +0000 (17:12 +0000)]
am
007e207b: Merge "Frameworks/base: Fix null-pointer check"
* commit '
007e207bdeda3f0143eba8f52db3e72bf7487efb':
Frameworks/base: Fix null-pointer check
Andreas Gampe [Mon, 16 Mar 2015 17:03:02 +0000 (17:03 +0000)]
am
d61cbf9a: Merge "Frameworks/base: Fix a constructor"
* commit '
d61cbf9a08733b45a6aecafffffa60da269a3e1e':
Frameworks/base: Fix a constructor
Andreas Gampe [Mon, 16 Mar 2015 16:59:13 +0000 (16:59 +0000)]
Merge "Frameworks/base: Fix null-pointer check"
Andreas Gampe [Mon, 16 Mar 2015 16:51:00 +0000 (16:51 +0000)]
Merge "Frameworks/base: Fix a constructor"
Robert Greenwalt [Mon, 16 Mar 2015 16:48:46 +0000 (16:48 +0000)]
am
7cff91ea: am
079cfa64: Merge "Frameworks/base: Fix a hashCode implementation"
* commit '
7cff91ea67f89ca963a822daa1b68674bfc0e587':
Frameworks/base: Fix a hashCode implementation
Andreas Gampe [Mon, 16 Mar 2015 16:45:34 +0000 (09:45 -0700)]
resolved conflicts for merge of
038b8462 to master
Change-Id: I394b152c3cfe8368e87fc4bc57566b410c96b554
Ronghua Wu [Mon, 16 Mar 2015 16:38:24 +0000 (16:38 +0000)]
Merge "media: add MediaFormat.KEY_PRIORITY."
Robert Greenwalt [Mon, 16 Mar 2015 16:29:52 +0000 (16:29 +0000)]
am
079cfa64: Merge "Frameworks/base: Fix a hashCode implementation"
* commit '
079cfa64ec827e80d3173e2043218866f1b36146':
Frameworks/base: Fix a hashCode implementation
Robert Greenwalt [Mon, 16 Mar 2015 16:17:50 +0000 (16:17 +0000)]
Merge "Frameworks/base: Fix a hashCode implementation"
Andreas Gampe [Mon, 16 Mar 2015 15:43:37 +0000 (15:43 +0000)]
am
5abcd06b: Merge "Frameworks/base: Fix always-false equals"
* commit '
5abcd06b1f673a2d59d1aba5f4b95fe741ace274':
Frameworks/base: Fix always-false equals
Mike Reed [Mon, 16 Mar 2015 15:36:42 +0000 (15:36 +0000)]
Merge "use SkFilterQuality instead of SkPaint::FilterLevel"
Mike Reed [Mon, 16 Mar 2015 15:16:09 +0000 (11:16 -0400)]
use SkFilterQuality instead of SkPaint::FilterLevel
Change-Id: I5d26869de746107b8a35a7a662236f993a824b0d
Geoff Mendal [Mon, 16 Mar 2015 15:29:50 +0000 (15:29 +0000)]
Merge "Import translations. DO NOT MERGE"
Andreas Gampe [Mon, 16 Mar 2015 15:28:52 +0000 (15:28 +0000)]
Merge "Frameworks/base: Fix always-false equals"
John Reck [Mon, 16 Mar 2015 15:16:17 +0000 (15:16 +0000)]
am
059ba981: am
386dcbdd: Merge "Frameworks/base: Fix missing cast"
* commit '
059ba9814bb07aeebd8bf697fc05ff833c63033b':
Frameworks/base: Fix missing cast
John Reck [Mon, 16 Mar 2015 15:09:04 +0000 (15:09 +0000)]
am
386dcbdd: Merge "Frameworks/base: Fix missing cast"
* commit '
386dcbddf5c166f98209b78389e79d49ab3a8222':
Frameworks/base: Fix missing cast
John Reck [Mon, 16 Mar 2015 14:56:51 +0000 (14:56 +0000)]
Merge "Frameworks/base: Fix missing cast"
Geoff Mendal [Mon, 16 Mar 2015 14:43:37 +0000 (07:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib0dfcbb5ffa71a512164af5435a0784279bde292
Auto-generated-cl: translation import
Robin Lee [Mon, 16 Mar 2015 14:32:08 +0000 (14:32 +0000)]
Merge "Recognise insecure encryption with a new constant"
Geoff Mendal [Mon, 16 Mar 2015 14:01:59 +0000 (14:01 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 16 Mar 2015 13:48:54 +0000 (13:48 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 16 Mar 2015 13:37:26 +0000 (06:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5974745b1b216beda4ebed9da78b0b2c0b4d4efe
Auto-generated-cl: translation import
Geoff Mendal [Mon, 16 Mar 2015 13:25:49 +0000 (06:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id941e0ba453bd6b39cf654f0a20a68219584bd2a
Auto-generated-cl: translation import
Geoff Mendal [Mon, 16 Mar 2015 13:22:28 +0000 (13:22 +0000)]
am
c64f5ca0: (-s ours) am
0134869b: (-s ours) am
74c66d10: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
c64f5ca02b16ebece40c21f401f75c7ace8178ac':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 13:22:20 +0000 (13:22 +0000)]
am
4777b612: (-s ours) am
3437d9e7: (-s ours) am
57d39a3d: (-s ours) Import translations. DO NOT MERGE
* commit '
4777b612e07f57afbcf362b78b0b6e1e5e77e8bb':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 13:20:49 +0000 (13:20 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 16 Mar 2015 13:19:39 +0000 (06:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: I47e03bc7c00c7cb751c063324027e7846b067eaf
Auto-generated-cl: translation import
Geoff Mendal [Mon, 16 Mar 2015 13:14:52 +0000 (13:14 +0000)]
am
0134869b: (-s ours) am
74c66d10: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
0134869b5c81771ae3e3251fa42ac6c478e62f5a':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 13:14:47 +0000 (13:14 +0000)]
am
3437d9e7: (-s ours) am
57d39a3d: (-s ours) Import translations. DO NOT MERGE
* commit '
3437d9e716e477d407dfc13cc797500e6421e464':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 13:10:08 +0000 (13:10 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 16 Mar 2015 13:08:42 +0000 (13:08 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 16 Mar 2015 13:07:29 +0000 (13:07 +0000)]
am
74c66d10: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
74c66d10a7b2237f8aaf8c10675a10b9347860f4':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 13:07:26 +0000 (13:07 +0000)]
am
57d39a3d: (-s ours) Import translations. DO NOT MERGE
* commit '
57d39a3d70cf820e830c351d9d7fbb5d16d42ecf':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 13:05:42 +0000 (13:05 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 16 Mar 2015 13:04:07 +0000 (13:04 +0000)]
am
3fb3408b: (-s ours) am
eb1aec7f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '
3fb3408b2ecdd601e93a2675ef0f81b15334ed0a':
Import translations. DO NOT MERGE
OSDN Git Service
