OSDN Git Service
Yuling Liang [Fri, 25 Apr 2014 17:35:52 +0000 (17:35 +0000)]
am
eea94f06: Merge "Revert "Followon fix for
14276128 Clipping at bottom of TextView"" into klp-modular-dev
* commit '
eea94f060a917a5c6195a81d8825551a430a8d69':
Revert "Followon fix for
14276128 Clipping at bottom of TextView"
Yuling Liang [Fri, 25 Apr 2014 17:32:28 +0000 (17:32 +0000)]
Merge "Revert "Followon fix for
14276128 Clipping at bottom of TextView"" into klp-modular-dev
Yuling Liang [Fri, 25 Apr 2014 17:32:08 +0000 (17:32 +0000)]
Revert "Followon fix for
14276128 Clipping at bottom of TextView"
This reverts commit
a10e19845ce76c0e4dd38018c84b83c9255dc9fe.
Change-Id: I6d40451c9eb6285859e16d251b55947663a3553a
Yuling Liang [Fri, 25 Apr 2014 16:34:15 +0000 (16:34 +0000)]
am
243e551a: Merge "Followon fix for
14276128 Clipping at bottom of TextView" into klp-modular-dev
* commit '
243e551ac380f86639eee3e95a482d8e17836670':
Followon fix for
14276128 Clipping at bottom of TextView
Yuling Liang [Fri, 25 Apr 2014 16:30:12 +0000 (16:30 +0000)]
Merge "Followon fix for
14276128 Clipping at bottom of TextView" into klp-modular-dev
Marco Nelissen [Fri, 25 Apr 2014 14:52:18 +0000 (14:52 +0000)]
am
eded9e3b: am
adcf38c9: Merge "Release DrmManagerClient resources"
* commit '
eded9e3b7f6f30526365461a25624b841611af28':
Release DrmManagerClient resources
Marco Nelissen [Fri, 25 Apr 2014 14:46:35 +0000 (14:46 +0000)]
am
adcf38c9: Merge "Release DrmManagerClient resources"
* commit '
adcf38c9936fa372309d413cec03a1413e797c7a':
Release DrmManagerClient resources
Marco Nelissen [Fri, 25 Apr 2014 14:42:02 +0000 (14:42 +0000)]
Merge "Release DrmManagerClient resources"
Craig Mautner [Fri, 25 Apr 2014 03:06:34 +0000 (03:06 +0000)]
am
3a656ea3: Merge "Too soon." into klp-modular-dev
* commit '
3a656ea32e6d6489f4bc45884e5acede9fe2de51':
Too soon.
Craig Mautner [Fri, 25 Apr 2014 03:03:37 +0000 (03:03 +0000)]
Merge "Too soon." into klp-modular-dev
Craig Mautner [Fri, 25 Apr 2014 03:01:40 +0000 (03:01 +0000)]
Too soon.
Change-Id: I1abb1d4841e4e6342c3b861d33ae22e22ed0a161
Selim Gurun [Fri, 25 Apr 2014 01:15:36 +0000 (01:15 +0000)]
am
e3fc3073: am
8c2d70f5: Merge "Add a stub for forgotten callback to fix master-gpl."
* commit '
e3fc3073826b4fdfa0d1be17fe0c79ccf211ad7d':
Add a stub for forgotten callback to fix master-gpl.
Selim Gurun [Fri, 25 Apr 2014 01:12:46 +0000 (01:12 +0000)]
am
8c2d70f5: Merge "Add a stub for forgotten callback to fix master-gpl."
* commit '
8c2d70f5e8dfe64213f44c29562fe4240779b68b':
Add a stub for forgotten callback to fix master-gpl.
Selim Gurun [Fri, 25 Apr 2014 01:08:48 +0000 (01:08 +0000)]
Merge "Add a stub for forgotten callback to fix master-gpl."
Selim Gurun [Fri, 25 Apr 2014 01:04:04 +0000 (18:04 -0700)]
Add a stub for forgotten callback to fix master-gpl.
Change-Id: I375dba89403d09dc39f696de04e0811633ecc803
Selim Gurun [Fri, 25 Apr 2014 00:47:23 +0000 (00:47 +0000)]
am
f7a19173: am
adad989b: Merge "Add a stub to fix master-gpl"
* commit '
f7a191731f6c840eed9283652648f267589502c2':
Add a stub to fix master-gpl
Craig Mautner [Fri, 25 Apr 2014 00:42:25 +0000 (00:42 +0000)]
am
3359bbe0: Merge "Add test for attribute android:allowEmbedded" into klp-modular-dev
* commit '
3359bbe02ca645bae2f495df51e7b4001de6c2b1':
Add test for attribute android:allowEmbedded
Selim Gurun [Fri, 25 Apr 2014 00:41:59 +0000 (00:41 +0000)]
am
adad989b: Merge "Add a stub to fix master-gpl"
* commit '
adad989b6a2c736f427526e747dcb89ed9762bab':
Add a stub to fix master-gpl
Selim Gurun [Fri, 25 Apr 2014 00:39:09 +0000 (00:39 +0000)]
Merge "Add a stub to fix master-gpl"
Craig Mautner [Fri, 25 Apr 2014 00:39:05 +0000 (00:39 +0000)]
Merge "Add test for attribute android:allowEmbedded" into klp-modular-dev
Selim Gurun [Fri, 25 Apr 2014 00:29:55 +0000 (17:29 -0700)]
Add a stub to fix master-gpl
Change-Id: I4cadd3a6e33843ccac4ef2eacbe508e40628367c
Elliott Hughes [Thu, 24 Apr 2014 23:59:05 +0000 (23:59 +0000)]
am
5f5ca3bc: am
31a1dd2a: Merge "Use the suggested public API instead of libcore.os."
* commit '
5f5ca3bc98fb773ee905289300595ad95d5ffabe':
Use the suggested public API instead of libcore.os.
Elliott Hughes [Thu, 24 Apr 2014 23:55:09 +0000 (23:55 +0000)]
am
31a1dd2a: Merge "Use the suggested public API instead of libcore.os."
* commit '
31a1dd2a8f56b439861ee335b55f44323318830c':
Use the suggested public API instead of libcore.os.
Elliott Hughes [Thu, 24 Apr 2014 23:52:16 +0000 (23:52 +0000)]
Merge "Use the suggested public API instead of libcore.os."
Andrew Solovay [Thu, 24 Apr 2014 23:45:09 +0000 (23:45 +0000)]
am
3cb4430b: am
27547e6d: am
fdc9e56f: Correcting name of \'Backup & reset\' menu.
* commit '
3cb4430b071e9e978853f73c0cccd15dc2f37a49':
Correcting name of 'Backup & reset' menu.
Andrew Solovay [Thu, 24 Apr 2014 23:41:26 +0000 (23:41 +0000)]
am
27547e6d: am
fdc9e56f: Correcting name of \'Backup & reset\' menu.
* commit '
27547e6d3a22fb9615594769e460c6a86f2dd44b':
Correcting name of 'Backup & reset' menu.
Andrew Solovay [Thu, 24 Apr 2014 23:37:40 +0000 (23:37 +0000)]
am
fdc9e56f: Correcting name of \'Backup & reset\' menu.
* commit '
fdc9e56ff8a1019c353e77f5d4b5f3566d173941':
Correcting name of 'Backup & reset' menu.
Elliott Hughes [Thu, 24 Apr 2014 00:58:57 +0000 (17:58 -0700)]
Use the suggested public API instead of libcore.os.
Change-Id: Id392e4c36c5721ca609d88d9ec6b9340ce05274c
Andrew Solovay [Thu, 24 Apr 2014 22:47:38 +0000 (15:47 -0700)]
Correcting name of 'Backup & reset' menu.
Doc is staged at
http://asolovay.mtv.corp.google.com:9000/guide/topics/data/backup.html#Testing
Bug:
14253720
Change-Id: Ib8eb213d8708c02c93c8bc93233db2c828caa925
Mark Salyzyn [Thu, 24 Apr 2014 22:17:11 +0000 (22:17 +0000)]
am
eacaa353: am
c717179e: Merge "jni: android_util_Process 64 bit issues"
* commit '
eacaa353e83942d3c59d0db594df0fb6179e0eea':
jni: android_util_Process 64 bit issues
Mark Salyzyn [Thu, 24 Apr 2014 22:14:02 +0000 (22:14 +0000)]
am
c717179e: Merge "jni: android_util_Process 64 bit issues"
* commit '
c717179e4fec346334fe4bb8603184499b746179':
jni: android_util_Process 64 bit issues
Mark Salyzyn [Thu, 24 Apr 2014 22:10:22 +0000 (22:10 +0000)]
Merge "jni: android_util_Process 64 bit issues"
Mark Salyzyn [Thu, 24 Apr 2014 20:05:18 +0000 (13:05 -0700)]
jni: android_util_Process 64 bit issues
- critical issue with using %lld to scanf into a jlong
- subsidiary issues with mix jint, jsize and jlong printing
Change-Id: I77c6b3d3a202fec741cacc540fc39ad6cba25f52
Raph Levien [Thu, 24 Apr 2014 19:51:35 +0000 (12:51 -0700)]
Followon fix for
14276128 Clipping at bottom of TextView
The previous fix did not work when the text was ellipsized, because the
test for whether the line was the last line was incorrect. The new test
handles both the end of the buffer and the case where it is the last
line because of ellipsizing.
So this should be the proper fix for bug
14276128 Clipping at bottom of
TextView when lineSpacingMultiplier < 1
Change-Id: Iac5c96f2273142031c18a27f504f7d6d5fcf823e
Nick Kralevich [Thu, 24 Apr 2014 18:25:58 +0000 (18:25 +0000)]
am
140dc63f: am
84803849: Merge "Zygote: enable CAP_BLOCK_SUSPEND capability for system server"
* commit '
140dc63f4f927a8eddddf8d11a142e6975c1c6cf':
Zygote: enable CAP_BLOCK_SUSPEND capability for system server
Nick Kralevich [Thu, 24 Apr 2014 18:22:20 +0000 (18:22 +0000)]
am
84803849: Merge "Zygote: enable CAP_BLOCK_SUSPEND capability for system server"
* commit '
8480384986c314bd97b841cbf7f63acb7055ecef':
Zygote: enable CAP_BLOCK_SUSPEND capability for system server
Nick Kralevich [Thu, 24 Apr 2014 18:18:01 +0000 (18:18 +0000)]
Merge "Zygote: enable CAP_BLOCK_SUSPEND capability for system server"
Daniel Leung [Fri, 20 Dec 2013 18:37:35 +0000 (10:37 -0800)]
Zygote: enable CAP_BLOCK_SUSPEND capability for system server
Starting from kernel 3.6, it requires processes to have the capability
CAP_BLOCK_SUSPEND to set/unset wake locks. Adds CAP_BLOCK_SUSPEND
to the list of capabilities for system server, so that PowerManager
can set wake locks.
Change-Id: I3246e6f6e6cb8f0bedb1c0417ed07085ee1f3aaa
Signed-off-by: Daniel Leung <daniel.leung@intel.com>
Craig Mautner [Thu, 24 Apr 2014 16:33:02 +0000 (16:33 +0000)]
am
03981a4c: Merge "Add activity attribute allowEmbedded" into klp-modular-dev
* commit '
03981a4c2e9689197e4d2c916c07ae16207b5276':
Add activity attribute allowEmbedded
Craig Mautner [Thu, 24 Apr 2014 16:30:14 +0000 (16:30 +0000)]
Merge "Add activity attribute allowEmbedded" into klp-modular-dev
Raph Levien [Thu, 24 Apr 2014 16:18:08 +0000 (16:18 +0000)]
am
e4ee0e31: Merge "Fix bug
14276128 Clipping at bottom of TextView" into klp-modular-dev
* commit '
e4ee0e3193f8e66cabc5352046969041ad4921e5':
Fix bug
14276128 Clipping at bottom of TextView
Michael Kolb [Thu, 24 Apr 2014 16:13:41 +0000 (16:13 +0000)]
am
e597d5f9: Merge "Use rotation to position circular display mask" into klp-modular-dev
* commit '
e597d5f9310f760843272c728d6fb1917abf241a':
Use rotation to position circular display mask
Raph Levien [Thu, 24 Apr 2014 16:12:54 +0000 (16:12 +0000)]
Merge "Fix bug
14276128 Clipping at bottom of TextView" into klp-modular-dev
Michael Kolb [Thu, 24 Apr 2014 16:08:21 +0000 (16:08 +0000)]
Merge "Use rotation to position circular display mask" into klp-modular-dev
Michael Kolb [Thu, 24 Apr 2014 05:06:21 +0000 (22:06 -0700)]
Use rotation to position circular display mask
Bug:
14231785
Change-Id: Ib6d69f3b9c2a638731539f1c1e51b56ad1698adc
Craig Mautner [Thu, 24 Apr 2014 15:42:32 +0000 (08:42 -0700)]
Add test for attribute android:allowEmbedded
Throw a SecurityException if it is not true for an activity launched
using ActivityContainer.startActivity().
Change-Id: Id1d70e630195a49a3eccdc64a0beccc420400332
Craig Mautner [Thu, 24 Apr 2014 04:38:50 +0000 (21:38 -0700)]
Add activity attribute allowEmbedded
Activitys without allowEmbedded=true may not be launched in an ActivityView.
Fixes bug
13693121.
Change-Id: I431d554300fc3504ab1bc7d73a58d5dad24f8639
Baligh Uddin [Thu, 24 Apr 2014 14:34:02 +0000 (14:34 +0000)]
am
aed314e8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
aed314e8f3e53627518222777c2fe89666bfd643':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 24 Apr 2014 14:28:31 +0000 (14:28 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Craig Mautner [Thu, 24 Apr 2014 09:11:30 +0000 (09:11 +0000)]
am
7d2d2272: Merge "Force ActivityView activities to start in new task" into klp-modular-dev
* commit '
7d2d2272f1dc91f27983797349f8253bfa25e8b4':
Force ActivityView activities to start in new task
Elliott Hughes [Thu, 24 Apr 2014 09:01:44 +0000 (09:01 +0000)]
am
8d47f23e: am
dbb0de21: Merge "Fix a typo in an assertion."
* commit '
8d47f23e43760dcbf051aaeffff668c3c6340276':
Fix a typo in an assertion.
Craig Mautner [Thu, 24 Apr 2014 04:28:27 +0000 (04:28 +0000)]
Merge "Force ActivityView activities to start in new task" into klp-modular-dev
Deepanshu Gupta [Thu, 24 Apr 2014 01:36:22 +0000 (01:36 +0000)]
am
7406e4b8: am
7947ec71: am
b64732d9: Merge "Fix style warnings in RenderSessionImpl [DO NOT MERGE]" into klp-dev
* commit '
7406e4b8102ffd71affd55a9f453c0ecce13a097':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]
Deepanshu Gupta [Thu, 24 Apr 2014 01:36:18 +0000 (01:36 +0000)]
am
1668ae8d: am
a019e772: am
6aaea1bd: Merge "Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]" into klp-dev
* commit '
1668ae8d2a29b491c3ae421c5b0eca101fb10824':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
Deepanshu Gupta [Thu, 24 Apr 2014 01:36:14 +0000 (01:36 +0000)]
am
e17ed922: am
126f4057: am
5ba2f230: Add view cookies for action bar menus. [DO NOT MERGE]
* commit '
e17ed922001cf70c48969eb7b10ee2e2557b41f9':
Add view cookies for action bar menus. [DO NOT MERGE]
Deepanshu Gupta [Thu, 24 Apr 2014 01:31:24 +0000 (01:31 +0000)]
am
7947ec71: am
b64732d9: Merge "Fix style warnings in RenderSessionImpl [DO NOT MERGE]" into klp-dev
* commit '
7947ec715d8b4a0c82135553abb4947b61bf802b':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]
Deepanshu Gupta [Thu, 24 Apr 2014 01:31:20 +0000 (01:31 +0000)]
am
a019e772: am
6aaea1bd: Merge "Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]" into klp-dev
* commit '
a019e77252f86962b9803042c01b897f7f1aa89f':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
Deepanshu Gupta [Thu, 24 Apr 2014 01:31:15 +0000 (01:31 +0000)]
am
126f4057: am
5ba2f230: Add view cookies for action bar menus. [DO NOT MERGE]
* commit '
126f4057a06756fbb1c194b5d9d40f9f922d14ee':
Add view cookies for action bar menus. [DO NOT MERGE]
Deepanshu Gupta [Thu, 24 Apr 2014 01:27:53 +0000 (01:27 +0000)]
am
b64732d9: Merge "Fix style warnings in RenderSessionImpl [DO NOT MERGE]" into klp-dev
* commit '
b64732d977c023423cd01d32361a49401d9203cd':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]
Deepanshu Gupta [Thu, 24 Apr 2014 01:27:50 +0000 (01:27 +0000)]
am
6aaea1bd: Merge "Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]" into klp-dev
* commit '
6aaea1bd4aa056335776098cd9dc523e898716f1':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
Deepanshu Gupta [Thu, 24 Apr 2014 01:27:45 +0000 (01:27 +0000)]
am
5ba2f230: Add view cookies for action bar menus. [DO NOT MERGE]
* commit '
5ba2f230faa355eb9bc1e90f6c48eeeb437f390c':
Add view cookies for action bar menus. [DO NOT MERGE]
Deepanshu Gupta [Thu, 24 Apr 2014 01:21:54 +0000 (01:21 +0000)]
Merge "Fix style warnings in RenderSessionImpl [DO NOT MERGE]" into klp-dev
Deepanshu Gupta [Thu, 24 Apr 2014 01:21:45 +0000 (01:21 +0000)]
Merge "Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]" into klp-dev
Deepanshu Gupta [Wed, 23 Apr 2014 00:22:32 +0000 (17:22 -0700)]
Fix style warnings in RenderSessionImpl [DO NOT MERGE]
Change-Id: I9d3cb23e4ea692f737a3e3d6c18cc8de18b66a3c
(cherry-picked from commit
fbfeb1a90b6f8f3966c60a69d50ce8f608d9d861)
Deepanshu Gupta [Fri, 18 Apr 2014 19:32:38 +0000 (12:32 -0700)]
Add view cookies for action bar menus. [DO NOT MERGE]
The change adds the view cookies for the menus rendered in the action
bar. This enables the IDE to map the menu to the relevant XML Tag in the
menu xml and show the highlighting accordingly.
The change also contains a bugfix where a method wasn't renamed
properly.
Change-Id: Idcfc263a8ebe0a4f25afa3a1eb085fa628fd03ca
(cherry-picked from commit
1001961f904bac5294aaf73a47c2497aa764bf7f)
Elliott Hughes [Thu, 24 Apr 2014 00:25:01 +0000 (00:25 +0000)]
am
dbb0de21: Merge "Fix a typo in an assertion."
* commit '
dbb0de21d35343504b096ae6cbf97d122ac410c9':
Fix a typo in an assertion.
Elliott Hughes [Wed, 23 Apr 2014 23:55:33 +0000 (23:55 +0000)]
Merge "Fix a typo in an assertion."
Elliott Hughes [Wed, 23 Apr 2014 23:54:33 +0000 (16:54 -0700)]
Fix a typo in an assertion.
Change-Id: I3e97bb3cb8070c0ec0c6b97769f1da3e7b4ef8f5
Raph Levien [Wed, 23 Apr 2014 22:52:55 +0000 (15:52 -0700)]
Fix bug
14276128 Clipping at bottom of TextView
Avoid applying "extra" linespacing to the last line of a layout, because
when that is negative, it causes clipping.
Change-Id: I4cc8792fd3444e4118604cc3d0f816d59dfc1e74
Deepanshu Gupta [Tue, 1 Apr 2014 01:59:45 +0000 (18:59 -0700)]
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
The bug caused some classes to be missed when computing the dependencies
of the existing classes.
Change-Id: I7285ff67e016ce5d73a8550501f49acc73cfadfa
(cherry-picked from
4a0f93bd32b8dd9b3c351680ad82e461d5111f38)
Craig Mautner [Wed, 23 Apr 2014 02:57:19 +0000 (19:57 -0700)]
Force ActivityView activities to start in new task
Activities were associating with existing tasks when their
components matched. This was causing them to be launched
into existing stacks rather than into their ActivityView. Adding
these flags forces the launches to be in unique tasks on their
ActivityView.
Fixes bug
14252286.
Change-Id: I9ba65a4a2da198435748c0a17396d3f7f8c75f5e
Baligh Uddin [Wed, 23 Apr 2014 18:27:35 +0000 (11:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: I99c697cc9974820312756fa89f51e3cf821401e2
Auto-generated-cl: translation import
Neil Fuller [Wed, 23 Apr 2014 16:48:34 +0000 (16:48 +0000)]
am
caf6497b: am
683cf1bf: Merge "Changes to support asynchronous close interruption"
* commit '
caf6497b9a0347da7d5acbe678adc2c8187176c0':
Changes to support asynchronous close interruption
Neil Fuller [Wed, 23 Apr 2014 16:45:15 +0000 (16:45 +0000)]
am
683cf1bf: Merge "Changes to support asynchronous close interruption"
* commit '
683cf1bffe33f49f26d46201f96cd2eff60e8192':
Changes to support asynchronous close interruption
Neil Fuller [Wed, 23 Apr 2014 16:41:16 +0000 (16:41 +0000)]
Merge "Changes to support asynchronous close interruption"
Neil Fuller [Fri, 11 Apr 2014 16:29:54 +0000 (17:29 +0100)]
Changes to support asynchronous close interruption
This change contains fixes to base from libcore change
I37de3e7d1a005a73821221e6156d10b95c595d7a
Bug:
13927110
Change-Id: I2d96e50307611c269dcf47886cd4d976854da8fc
Andrew Solovay [Wed, 23 Apr 2014 02:51:48 +0000 (02:51 +0000)]
am
32117212: am
6c5bfa2f: am
026c82b1: Doc: Fixed a code sample to use standard methods. Also some formatting tweaks.
* commit '
32117212fc48872b557044ff25ba6b8d9ace5738':
Doc: Fixed a code sample to use standard methods. Also some formatting tweaks.
Andrew Solovay [Wed, 23 Apr 2014 02:47:50 +0000 (02:47 +0000)]
am
6c5bfa2f: am
026c82b1: Doc: Fixed a code sample to use standard methods. Also some formatting tweaks.
* commit '
6c5bfa2f348f1d55cbff5f8f2bd61e88ac2d01ee':
Doc: Fixed a code sample to use standard methods. Also some formatting tweaks.
Andrew Solovay [Wed, 23 Apr 2014 02:44:06 +0000 (02:44 +0000)]
am
026c82b1: Doc: Fixed a code sample to use standard methods. Also some formatting tweaks.
* commit '
026c82b1916a9e2b48b9ff62ffeb935d63935a68':
Doc: Fixed a code sample to use standard methods. Also some formatting tweaks.
Andrew Solovay [Tue, 22 Apr 2014 22:46:42 +0000 (15:46 -0700)]
Doc: Fixed a code sample to use standard methods. Also some formatting
tweaks.
Added blank lines for readability, and broke some long lines
so code samples don't need a scroll bar.
(Update: Fixed indentation that I broke on a code sample.)
Bug:
14045051
Change-Id: I1cf08b899ec55f9093545e71861c84120e4b56a1
Baligh Uddin [Wed, 23 Apr 2014 02:13:29 +0000 (02:13 +0000)]
am
89ed56fa: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
89ed56fa6c5951e4ce7ea555ae8f90c65b2daa2d':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:08:22 +0000 (02:08 +0000)]
am
d14bb3cf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
d14bb3cfb95e5bebb181ec9ed08295f25b87a94f':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:08:19 +0000 (02:08 +0000)]
am
abd2a4a4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
abd2a4a44923c28111bdf9ccb59e5557f0deafeb':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:08:13 +0000 (02:08 +0000)]
am
c2c527a6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
c2c527a6f4b3629ea271ef5444292a02e2d9a17e':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:08:10 +0000 (02:08 +0000)]
am
13c48fba: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
13c48fba164a977bbf4ef64434427bab297421bf':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:08:07 +0000 (02:08 +0000)]
am
611dd7b7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
611dd7b70a809ac766e4e1675a4ae1a115cf6cdf':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:08:04 +0000 (02:08 +0000)]
am
4516c695: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
4516c695b2d8fdbc7dc0427a98841805e47f1e16':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:08:00 +0000 (02:08 +0000)]
am
2d45d4de: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
2d45d4de489563907aebe8bb29c3b965749fe81e':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:07:57 +0000 (02:07 +0000)]
am
5eb7136d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
5eb7136de95111983bef2357e2543730f66cde03':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:07:54 +0000 (02:07 +0000)]
am
71b82aed: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
71b82aedca5c8d38bed8f3f75d3c71f82cedcd3b':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:07:51 +0000 (02:07 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 23 Apr 2014 02:07:51 +0000 (02:07 +0000)]
am
2d6e077d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
2d6e077d1db0da9a008ff6014ebbb555c30a7c47':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:07:48 +0000 (02:07 +0000)]
am
42c0488a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
42c0488a4b4db802161dc60a0bd16d2e5bc6afbe':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:07:45 +0000 (02:07 +0000)]
am
9dbd2eeb: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
9dbd2eebf9095c4513b333a1ccce12e7d4523bd1':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:01:08 +0000 (02:01 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 23 Apr 2014 02:01:06 +0000 (02:01 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 23 Apr 2014 02:01:03 +0000 (02:01 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 23 Apr 2014 02:01:02 +0000 (02:01 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 23 Apr 2014 02:00:59 +0000 (02:00 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 23 Apr 2014 02:00:57 +0000 (02:00 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
OSDN Git Service
