OSDN Git Service
Geoff Mendal [Wed, 11 Feb 2015 19:30:48 +0000 (19:30 +0000)]
am
d232a3fa: (-s ours) am
60d2ee87: (-s ours) Import translations. DO NOT MERGE
automerge:
f513ca2 -s ours
* commit '
f513ca2fa187ffdd099272b12df932f89be4824c':
Geoff Mendal [Wed, 11 Feb 2015 19:20:15 +0000 (19:20 +0000)]
am
d232a3fa: (-s ours) am
60d2ee87: (-s ours) Import translations. DO NOT MERGE
* commit '
d232a3fa5c86f19ccf559bf4dc649d39d3620ca3':
Geoff Mendal [Wed, 11 Feb 2015 15:15:19 +0000 (15:15 +0000)]
Merge "Import translations. DO NOT MERGE"
Adrian Roos [Wed, 11 Feb 2015 15:11:41 +0000 (15:11 +0000)]
Merge "Remove obsolete WifiSettingsForSetupWizardXL"
Geoff Mendal [Wed, 11 Feb 2015 15:06:40 +0000 (07:06 -0800)]
Import translations. DO NOT MERGE
Change-Id: Idf53b16beb75bcfd79390205701efe1548920e47
Auto-generated-cl: translation import
Geoff Mendal [Wed, 11 Feb 2015 15:04:20 +0000 (15:04 +0000)]
Import translations. DO NOT MERGE automerge:
60d2ee8 -s ours
automerge:
96a90af -s ours
* commit '
96a90af83bddfec535bc4ebe96545145d0b33285':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 11 Feb 2015 15:03:56 +0000 (15:03 +0000)]
am
60d2ee87: (-s ours) Import translations. DO NOT MERGE
* commit '
60d2ee878896ccf29f99b825cdbae75182ed41f3':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 11 Feb 2015 15:00:50 +0000 (15:00 +0000)]
Import translations. DO NOT MERGE
automerge:
60d2ee8 -s ours
* commit '
60d2ee878896ccf29f99b825cdbae75182ed41f3':
Import translations. DO NOT MERGE
Adrian Roos [Wed, 11 Feb 2015 14:54:45 +0000 (15:54 +0100)]
Remove obsolete WifiSettingsForSetupWizardXL
Bug:
18405549
Change-Id: I30c7c9ee8f544054b13cfc24f7433bdc1448e339
Geoff Mendal [Wed, 11 Feb 2015 14:50:09 +0000 (06:50 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7d22626907a0705a5de9956d740ed6ddaf9a6ca0
Auto-generated-cl: translation import
Alan Viverette [Wed, 11 Feb 2015 00:42:36 +0000 (00:42 +0000)]
Merge "Replace data_usage_bar with progress background tint"
Dianne Hackborn [Tue, 10 Feb 2015 17:41:37 +0000 (17:41 +0000)]
Merge "Fix issue #
19272671: Context unclear or missing..."
Alan Viverette [Mon, 9 Feb 2015 22:06:17 +0000 (14:06 -0800)]
Replace data_usage_bar with progress background tint
Change-Id: Id9b0d3946f2182fb8f0e09d4891f864de99ba1c5
Dianne Hackborn [Mon, 9 Feb 2015 19:20:03 +0000 (11:20 -0800)]
Fix issue #
19272671: Context unclear or missing...
"USEDRAM of TOTALRAM used over TIME"
Change-Id: Ib0eecafe3c6f5bd1408adac584d6b5715e7a7d2f
Geoff Mendal [Mon, 9 Feb 2015 16:38:38 +0000 (16:38 +0000)]
am
278c81a6: (-s ours) am
37dfabff: (-s ours) am
713e794d: (-s ours) Import translations. DO NOT MERGE
* commit '
278c81a62611a0337786e892eb1c110093197cf7':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 9 Feb 2015 16:31:32 +0000 (16:31 +0000)]
am
37dfabff: (-s ours) am
713e794d: (-s ours) Import translations. DO NOT MERGE
* commit '
37dfabff82bd78d0956f41868579bdf5eb885078':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 9 Feb 2015 16:07:10 +0000 (16:07 +0000)]
am
713e794d: (-s ours) Import translations. DO NOT MERGE
* commit '
713e794dac88e4e977faa95da88163db6a568e15':
Import translations. DO NOT MERGE
Zoltan Szatmary-Ban [Mon, 9 Feb 2015 15:03:00 +0000 (15:03 +0000)]
Merge "Make Settings > Security > Apps with Usage Access multiprofile aware"
Geoff Mendal [Mon, 9 Feb 2015 14:40:55 +0000 (06:40 -0800)]
Import translations. DO NOT MERGE
Change-Id: I17e0fc29342180c113a3664822bf1c87617daed7
Auto-generated-cl: translation import
Geoff Mendal [Mon, 9 Feb 2015 14:31:43 +0000 (06:31 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0bbc9548cc2af07fd420ef97b5b39fe07b96c4d8
Auto-generated-cl: translation import
Zoltan Szatmary-Ban [Mon, 9 Feb 2015 13:13:37 +0000 (13:13 +0000)]
Merge "Eliminate duplicated code for creating circled user icons in Settings."
Zoltan Szatmary-Ban [Mon, 9 Feb 2015 13:06:57 +0000 (13:06 +0000)]
Merge "Remove frame and shadow from CircleFramedDrawable"
Zoltan Szatmary-Ban [Mon, 9 Feb 2015 12:53:31 +0000 (12:53 +0000)]
Merge "Eliminate duplicated code in Settings for category headers"
Dianne Hackborn [Sat, 7 Feb 2015 00:35:41 +0000 (16:35 -0800)]
Include home state in mem usage.
Change-Id: I7639e963386adf55a18139f395e7fc43277cc930
Adrian Roos [Thu, 5 Feb 2015 19:20:48 +0000 (19:20 +0000)]
Merge "Ensure new credentails are valid"
James Cook [Thu, 5 Feb 2015 18:43:59 +0000 (18:43 +0000)]
Merge "Extend translation char limit for auto date and time zone"
James Cook [Wed, 4 Feb 2015 22:04:30 +0000 (14:04 -0800)]
Extend translation char limit for auto date and time zone
There's enough space for 30 chars and some languages (Polish) need
more space.
Bug:
19159289
Change-Id: Ib24eeaf33c2eb3150cf3938757cdfa3c755c2674
Jason Monk [Wed, 28 Jan 2015 15:35:53 +0000 (10:35 -0500)]
Move some wifi tracking code to SettingsLib
Move tracking of which networks are available/saved and their state
over to SettingsLib to share it with Quick Settings.
Bug:
19180466
Change-Id: Iaeef06b26da8cb38e1ba09a7d105d04d499dc181
Geoff Mendal [Wed, 4 Feb 2015 18:58:05 +0000 (18:58 +0000)]
am
2a9fef1a: (-s ours) Import translations. DO NOT MERGE automerge:
40e66bc -s ours
* commit '
2a9fef1ae71c2580741a8ac960a385e915622c17':
Import translations. DO NOT MERGE
Jason Monk [Tue, 13 Jan 2015 15:05:53 +0000 (10:05 -0500)]
Make Settings include new SettingsLib
Bug:
19180466
Change-Id: I1ab5f2ac2d5faa5640ebe6e08ba8071a02ac8308
Geoff Mendal [Wed, 4 Feb 2015 15:06:43 +0000 (07:06 -0800)]
Import translations. DO NOT MERGE
Change-Id: I679e2872bb5e2ce8ceba94d4da883db9bdbec5f4
Auto-generated-cl: translation import
Geoff Mendal [Wed, 4 Feb 2015 15:04:49 +0000 (15:04 +0000)]
Import translations. DO NOT MERGE
automerge:
40e66bc -s ours
* commit '
40e66bce6ceea1b2b9d49a26564665222eb32745':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Feb 2015 14:50:08 +0000 (06:50 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6c5b25e39ed6da72c5e7a85329947bec91032120
Auto-generated-cl: translation import
Svetoslav [Wed, 4 Feb 2015 05:58:11 +0000 (21:58 -0800)]
Fix crash in print settings utils
Change-Id: I8000b674c0579988d6dfae2fcff136a06c721362
Amith Yamasani [Tue, 3 Feb 2015 21:31:56 +0000 (21:31 +0000)]
Merge "set tapjacking protection for deviceadmin permission dialog" automerge:
6317e06
automerge:
47ba346
* commit '
47ba346e1ea491f925ad47a4fa04b217bfcb4019':
set tapjacking protection for deviceadmin permission dialog
Amith Yamasani [Tue, 3 Feb 2015 21:29:19 +0000 (21:29 +0000)]
Merge "set tapjacking protection for deviceadmin permission dialog"
automerge:
6317e06
* commit '
6317e06635ed52a9d1c1aeb0439017418f57ad0f':
set tapjacking protection for deviceadmin permission dialog
Amith Yamasani [Tue, 3 Feb 2015 21:24:51 +0000 (21:24 +0000)]
Merge "set tapjacking protection for deviceadmin permission dialog"
Adrian Roos [Tue, 3 Feb 2015 18:58:19 +0000 (19:58 +0100)]
Ensure new credentails are valid
Follow-up to I6f369eb60f8f6bb1e33384cd06534c713ab52e79
Bug:
18931518
Change-Id: I311b255a034b0cec8fee70b0f4938e6ebb20d95e
Sanket Padawe [Tue, 3 Feb 2015 18:24:42 +0000 (18:24 +0000)]
Merge "Remove SimDialogActivity from recents app list." into lmp-mr1-dev automerge:
4decadb automerge:
c1af278
automerge:
2493118
* commit '
2493118a3ca150bdb94d87dda17e7b3bd3940af7':
Remove SimDialogActivity from recents app list.
Sanket Padawe [Tue, 3 Feb 2015 18:19:05 +0000 (18:19 +0000)]
Merge "Remove SimDialogActivity from recents app list." into lmp-mr1-dev automerge:
4decadb
automerge:
c1af278
* commit '
c1af278c9da7f355fd9da883efb88a3e4d0f3b19':
Remove SimDialogActivity from recents app list.
Sanket Padawe [Tue, 3 Feb 2015 18:14:03 +0000 (18:14 +0000)]
Merge "Remove SimDialogActivity from recents app list." into lmp-mr1-dev
automerge:
4decadb
* commit '
4decadbc44b12cca8790b4d27ab9c29e34cb9909':
Remove SimDialogActivity from recents app list.
Sanket Padawe [Tue, 3 Feb 2015 18:10:47 +0000 (18:10 +0000)]
Merge "Remove SimDialogActivity from recents app list." into lmp-mr1-dev
Dianne Hackborn [Tue, 3 Feb 2015 17:43:54 +0000 (17:43 +0000)]
Merge "Make proc stats UI app-centric instead of process-centric."
Andres Morales [Tue, 3 Feb 2015 16:04:37 +0000 (16:04 +0000)]
am
2e75203a: Use getDefaultAdapter instead of getNfcAdapter automerge:
98d8a49
automerge:
4bd31b9
* commit '
4bd31b9ac676a5d3c6943bc9f86f524eedad5bef':
Use getDefaultAdapter instead of getNfcAdapter
Andres Morales [Tue, 3 Feb 2015 16:01:45 +0000 (16:01 +0000)]
am
2e75203a: Use getDefaultAdapter instead of getNfcAdapter
automerge:
98d8a49
* commit '
98d8a490d5930c9f6179c8aefe792012c542ddbb':
Use getDefaultAdapter instead of getNfcAdapter
Andres Morales [Tue, 3 Feb 2015 15:53:17 +0000 (15:53 +0000)]
am
2e75203a: Use getDefaultAdapter instead of getNfcAdapter
* commit '
2e75203a6ecb81725b68bced6c5f8d5be37365f1':
Use getDefaultAdapter instead of getNfcAdapter
Dianne Hackborn [Sat, 31 Jan 2015 02:19:38 +0000 (18:19 -0800)]
Make proc stats UI app-centric instead of process-centric.
The UI now shows a much simpler overview of memory use for
the current measured duration, computing the weighted RAM
user per application. (This is done basically by rolling up
each individual process into an app that can contain multiple
processes, and using the recently introduced weighted RAM for
all data processing.)
The details screen is updated to reflect this new design,
showing an overview of a particular application, which
separate entries for each process running for that app.
Change-Id: I47d79c30086d733eb37440a6c21b18a92b767d01
Sanket Padawe [Tue, 3 Feb 2015 00:46:55 +0000 (16:46 -0800)]
Remove SimDialogActivity from recents app list.
Bug:
19237301
Change-Id: I09f12c16e5afc0058f19f92ffbfd930fa099fd9b
Andres Morales [Mon, 2 Feb 2015 17:35:14 +0000 (09:35 -0800)]
Use getDefaultAdapter instead of getNfcAdapter
getNfcAdapter can throw an exception if NFC is not
available
Bug:
19227597
Change-Id: Ib95849057938066dc5760a34f16333f5423ce61f
Geoff Mendal [Mon, 2 Feb 2015 15:36:59 +0000 (15:36 +0000)]
am
c202347d: (-s ours) am
0bb8ba32: (-s ours) Import translations. DO NOT MERGE
* commit '
c202347d6ec25a525ac51707461b903d7061270d':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 2 Feb 2015 15:30:26 +0000 (15:30 +0000)]
am
0bb8ba32: (-s ours) Import translations. DO NOT MERGE
* commit '
0bb8ba322e0bed9d988e14888079c5d6283cfacc':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 2 Feb 2015 15:09:27 +0000 (07:09 -0800)]
Import translations. DO NOT MERGE
Change-Id: I879cccfc5c07605392d8db79212f1e12e8f261a3
Auto-generated-cl: translation import
Geoff Mendal [Mon, 2 Feb 2015 14:52:47 +0000 (06:52 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3dc578880274b5d2625b2686be2cd56589bb486a
Auto-generated-cl: translation import
Robin Lee [Mon, 2 Feb 2015 11:51:53 +0000 (11:51 +0000)]
am
70dbf05d: am
528c64e2: Merge "Repair broken keychain wifi_uid logic" into lmp-mr1-dev automerge:
d16231d
* commit '
70dbf05d50f29685f0754a35c96fe2b041b5ac2f':
Repair broken keychain wifi_uid logic
Robin Lee [Mon, 2 Feb 2015 11:45:57 +0000 (11:45 +0000)]
am
528c64e2: Merge "Repair broken keychain wifi_uid logic" into lmp-mr1-dev
automerge:
d16231d
* commit '
d16231de248aeb5aeccb8f4aa226a2f1b34cc082':
Repair broken keychain wifi_uid logic
Zoltan Szatmary-Ban [Wed, 28 Jan 2015 16:45:06 +0000 (16:45 +0000)]
Make Settings > Security > Apps with Usage Access multiprofile aware
Show badged apps with usage access together with non-badged ones.
Bug:
19157660
Change-Id: Ia294719678d5581c49b1fae3836a0b585ca5c140
Robin Lee [Mon, 2 Feb 2015 11:28:42 +0000 (11:28 +0000)]
am
528c64e2: Merge "Repair broken keychain wifi_uid logic" into lmp-mr1-dev
* commit '
528c64e205bf1d8f8237fb4e582d152958345b92':
Repair broken keychain wifi_uid logic
Robin Lee [Mon, 2 Feb 2015 11:22:01 +0000 (11:22 +0000)]
Merge "Repair broken keychain wifi_uid logic" into lmp-mr1-dev
Sanket Padawe [Fri, 30 Jan 2015 21:19:33 +0000 (21:19 +0000)]
am
55ebba9b: Change to fit color name text on color selection spinner in settings. automerge:
a46c723 automerge:
f99df05
* commit '
55ebba9bedcfec79586426ccebda55b5b7af45f9':
Change to fit color name text on color selection spinner in settings.
Sanket Padawe [Fri, 30 Jan 2015 19:58:41 +0000 (19:58 +0000)]
Change to fit color name text on color selection spinner in settings. automerge:
a46c723
automerge:
f99df05
* commit '
f99df057acb077e7601ec11d27be1bca0265247b':
Change to fit color name text on color selection spinner in settings.
Sanket Padawe [Fri, 30 Jan 2015 19:50:33 +0000 (19:50 +0000)]
Change to fit color name text on color selection spinner in settings.
automerge:
a46c723
* commit '
a46c7236b6d71c861b49d20dd7515a9031764909':
Change to fit color name text on color selection spinner in settings.
Sanket Padawe [Fri, 30 Jan 2015 19:23:22 +0000 (11:23 -0800)]
Change to fit color name text on color selection spinner in settings.
Bug:
19206902
Change-Id: I5903ac6d6c1abd7a33a0c47483335114e28a0f51
Robin Lee [Fri, 30 Jan 2015 14:57:25 +0000 (14:57 +0000)]
Repair broken keychain wifi_uid logic
Check for cross-user installs was missing a short-circuit for installs
where no UID was specified. This is now added.
Bug:
19194391
Change-Id: I10aa8323b47e0fcabb59e7c30d677080bb80b976
Stephan Huber [Fri, 23 Jan 2015 08:49:57 +0000 (09:49 +0100)]
set tapjacking protection for deviceadmin permission dialog
Second try to commit tapjacking protection for device administrator permission dialog.
Remplaced tap by spaces
Signed-off-by: Stephan Huber <huber.stephan.sit@gmail.com>
Change-Id: I8e14e713d1f039ca79f5006cdeb12b65652884fb
Sanket Padawe [Fri, 30 Jan 2015 02:59:09 +0000 (02:59 +0000)]
am
b33c8ad5: am
ef72625b: am
ab845180: Remove sim status and imei for secondary user.
* commit '
b33c8ad518796e7931cff157b06f791384d575d8':
Remove sim status and imei for secondary user.
Sanket Padawe [Fri, 30 Jan 2015 02:52:06 +0000 (02:52 +0000)]
am
ef72625b: am
ab845180: Remove sim status and imei for secondary user.
* commit '
ef72625b5243f2afc6b63553ce57f439801d6977':
Remove sim status and imei for secondary user.
Sanket Padawe [Fri, 30 Jan 2015 02:41:47 +0000 (02:41 +0000)]
am
ab845180: Remove sim status and imei for secondary user.
* commit '
ab84518009c53e28e021f27696cd4e51360fccbc':
Remove sim status and imei for secondary user.
Sanket Padawe [Fri, 30 Jan 2015 01:19:26 +0000 (17:19 -0800)]
Remove sim status and imei for secondary user.
Bug:
19165700
Change-Id: I4cc4b09a66acb3c88ac33e6479b165b6872404c8
Fyodor Kupolov [Thu, 29 Jan 2015 21:02:14 +0000 (21:02 +0000)]
am
922e602b: am
b749c336: am
c4dba451: am
b26bec1a: am
83930bc3: am
a6c8a0e6: am
d8b606b8: am
2f3bc3cb: (-s ours) am
e3904c4f: am
e8e7b9b3: Added a check if a custom activity can be started automerge:
3a3ff59 automerge:
5b2b7e1
* commit '
922e602b3ab6b0ea22b0f84e29bad1b8ffbe8a02':
Fyodor Kupolov [Thu, 29 Jan 2015 20:56:45 +0000 (20:56 +0000)]
am
b749c336: am
c4dba451: am
b26bec1a: am
83930bc3: am
a6c8a0e6: am
d8b606b8: am
2f3bc3cb: (-s ours) am
e3904c4f: am
e8e7b9b3: Added a check if a custom activity can be started automerge:
3a3ff59 automerge:
5b2b7e1
* commit '
b749c3368c0bd40a84026b44189e9119a0a27d15':
Fyodor Kupolov [Thu, 29 Jan 2015 20:51:32 +0000 (20:51 +0000)]
am
c4dba451: am
b26bec1a: am
83930bc3: am
a6c8a0e6: am
d8b606b8: am
2f3bc3cb: (-s ours) am
e3904c4f: am
e8e7b9b3: Added a check if a custom activity can be started automerge:
3a3ff59 automerge:
5b2b7e1
* commit '
c4dba4513b22a59911bfee358c6537f53bbb89a7':
Fyodor Kupolov [Thu, 29 Jan 2015 20:46:13 +0000 (20:46 +0000)]
am
b26bec1a: am
83930bc3: am
a6c8a0e6: am
d8b606b8: am
2f3bc3cb: (-s ours) am
e3904c4f: am
e8e7b9b3: Added a check if a custom activity can be started automerge:
3a3ff59 automerge:
5b2b7e1
* commit '
b26bec1a6fd7c03d667d7fa83bffd0ee8afb7b3e':
Fyodor Kupolov [Thu, 29 Jan 2015 20:39:11 +0000 (20:39 +0000)]
am
83930bc3: am
a6c8a0e6: am
d8b606b8: am
2f3bc3cb: (-s ours) am
e3904c4f: am
e8e7b9b3: Added a check if a custom activity can be started automerge:
3a3ff59 automerge:
5b2b7e1
* commit '
83930bc3ee26001e18a3f708e05c0e967e21e559':
Fyodor Kupolov [Thu, 29 Jan 2015 20:34:29 +0000 (20:34 +0000)]
am
a6c8a0e6: am
d8b606b8: am
2f3bc3cb: (-s ours) am
e3904c4f: am
e8e7b9b3: Added a check if a custom activity can be started automerge:
3a3ff59
automerge:
5b2b7e1
* commit '
5b2b7e189766e889118059902a15a4ce2c127e9d':
Mike Lockwood [Thu, 29 Jan 2015 20:26:29 +0000 (20:26 +0000)]
Merge "Add MIDI to USB configuration developer setting"
Fyodor Kupolov [Thu, 29 Jan 2015 20:03:26 +0000 (20:03 +0000)]
am
d5363a1e: am
32f0525c: am
ac840cd9: am
f400051c: am
9e432a69: am
d7e93570: am
f11f9f47: Added a check if a custom activity can be started automerge:
57641a8 automerge:
0738bae
* commit '
d5363a1e3ca129fceed8a8b36de66611e4219819':
Fyodor Kupolov [Thu, 29 Jan 2015 19:56:48 +0000 (19:56 +0000)]
am
32f0525c: am
ac840cd9: am
f400051c: am
9e432a69: am
d7e93570: am
f11f9f47: Added a check if a custom activity can be started automerge:
57641a8 automerge:
0738bae
* commit '
32f0525c78a0777f4811d564b8990214fb157c0c':
Fyodor Kupolov [Thu, 29 Jan 2015 19:51:01 +0000 (19:51 +0000)]
am
ac840cd9: am
f400051c: am
9e432a69: am
d7e93570: am
f11f9f47: Added a check if a custom activity can be started automerge:
57641a8 automerge:
0738bae
* commit '
ac840cd91b77c0a37723723a9d6101beec53bcd1':
Fyodor Kupolov [Thu, 29 Jan 2015 19:42:06 +0000 (19:42 +0000)]
am
f400051c: am
9e432a69: am
d7e93570: am
f11f9f47: Added a check if a custom activity can be started automerge:
57641a8 automerge:
0738bae
* commit '
f400051c3a6476154adf185399cb2ad8b2b16657':
Fyodor Kupolov [Thu, 29 Jan 2015 19:39:59 +0000 (19:39 +0000)]
am
a6c8a0e6: am
d8b606b8: am
2f3bc3cb: (-s ours) am
e3904c4f: am
e8e7b9b3: Added a check if a custom activity can be started
automerge:
3a3ff59
* commit '
3a3ff591976ef7503d382be2897cad5710cd80e7':
Added a check if a custom activity can be started
Fyodor Kupolov [Thu, 29 Jan 2015 19:35:36 +0000 (19:35 +0000)]
am
3c7ccfe4: am
c7e94b04: am
037c8118: am
6355e115: am
77a2e3d6: am
3a3ff591: am
a6c8a0e6: am
d8b606b8: am
2f3bc3cb: (-s ours) am
e3904c4f: am
e8e7b9b3: Added a check if a custom activity can be started
* commit '
3c7ccfe42ef03e82f912d3d871893436fc9d8102':
Added a check if a custom activity can be started
Fyodor Kupolov [Thu, 29 Jan 2015 19:35:11 +0000 (19:35 +0000)]
am
9e432a69: am
d7e93570: am
f11f9f47: Added a check if a custom activity can be started automerge:
57641a8 automerge:
0738bae
* commit '
9e432a698b6422118c2cc0d0a6c12194c9d1fc32':
Fyodor Kupolov [Thu, 29 Jan 2015 19:29:20 +0000 (19:29 +0000)]
am
d7e93570: am
f11f9f47: Added a check if a custom activity can be started automerge:
57641a8
automerge:
0738bae
* commit '
0738bae9164b150ce81b8cba57be9105a0308115':
Fyodor Kupolov [Thu, 29 Jan 2015 19:28:07 +0000 (19:28 +0000)]
am
c7e94b04: am
037c8118: am
6355e115: am
77a2e3d6: am
3a3ff591: am
a6c8a0e6: am
d8b606b8: am
2f3bc3cb: (-s ours) am
e3904c4f: am
e8e7b9b3: Added a check if a custom activity can be started
* commit '
c7e94b04360a130153fbe4212399b7a31858d316':
Added a check if a custom activity can be started
Fyodor Kupolov [Thu, 29 Jan 2015 19:22:33 +0000 (19:22 +0000)]
am
037c8118: am
6355e115: am
77a2e3d6: am
3a3ff591: am
a6c8a0e6: am
d8b606b8: am
2f3bc3cb: (-s ours) am
e3904c4f: am
e8e7b9b3: Added a check if a custom activity can be started
* commit '
037c811844cb29a16e940e6fbeae721c12715684':
Added a check if a custom activity can be started
Fyodor Kupolov [Thu, 29 Jan 2015 19:16:10 +0000 (19:16 +0000)]
am
6355e115: am
77a2e3d6: am
3a3ff591: am
a6c8a0e6: am
d8b606b8: am
2f3bc3cb: (-s ours) am
e3904c4f: am
e8e7b9b3: Added a check if a custom activity can be started
* commit '
6355e1152ab29735721c40cfab6431a65341218b':
Added a check if a custom activity can be started
Fyodor Kupolov [Thu, 29 Jan 2015 19:09:23 +0000 (19:09 +0000)]
am
77a2e3d6: am
3a3ff591: am
a6c8a0e6: am
d8b606b8: am
2f3bc3cb: (-s ours) am
e3904c4f: am
e8e7b9b3: Added a check if a custom activity can be started
* commit '
77a2e3d62574be9cf0aae17231fd423a7a399984':
Added a check if a custom activity can be started
Fyodor Kupolov [Thu, 29 Jan 2015 19:03:01 +0000 (19:03 +0000)]
am
3a3ff591: am
a6c8a0e6: am
d8b606b8: am
2f3bc3cb: (-s ours) am
e3904c4f: am
e8e7b9b3: Added a check if a custom activity can be started
* commit '
3a3ff591976ef7503d382be2897cad5710cd80e7':
Added a check if a custom activity can be started
Fyodor Kupolov [Thu, 29 Jan 2015 18:57:22 +0000 (18:57 +0000)]
am
a6c8a0e6: am
d8b606b8: am
2f3bc3cb: (-s ours) am
e3904c4f: am
e8e7b9b3: Added a check if a custom activity can be started
* commit '
a6c8a0e66d92bde12ae6f1934f020e7700db05d1':
Added a check if a custom activity can be started
Fyodor Kupolov [Thu, 29 Jan 2015 18:56:22 +0000 (18:56 +0000)]
am
5cf685fa: am
d5fcd896: am
9fce9185: am
bd89b7b4: am
0d5ad3b7: am
57641a8b: am
d7e93570: am
f11f9f47: Added a check if a custom activity can be started
* commit '
5cf685fa0072a391685defa0cb1585e91b465d44':
Added a check if a custom activity can be started
Fyodor Kupolov [Thu, 29 Jan 2015 18:50:43 +0000 (18:50 +0000)]
am
d8b606b8: am
2f3bc3cb: (-s ours) am
e3904c4f: am
e8e7b9b3: Added a check if a custom activity can be started
* commit '
d8b606b81a5ed77d3d2cbbaa7de26853126c25d7':
Added a check if a custom activity can be started
Fyodor Kupolov [Thu, 29 Jan 2015 18:45:51 +0000 (18:45 +0000)]
am
2f3bc3cb: (-s ours) am
e3904c4f: am
e8e7b9b3: Added a check if a custom activity can be started
* commit '
2f3bc3cb3f5add3962fb0ad441c27d44fede7787':
Added a check if a custom activity can be started
Fyodor Kupolov [Thu, 29 Jan 2015 18:44:50 +0000 (18:44 +0000)]
am
d5fcd896: am
9fce9185: am
bd89b7b4: am
0d5ad3b7: am
57641a8b: am
d7e93570: am
f11f9f47: Added a check if a custom activity can be started
* commit '
d5fcd8965f894196578fae18613b3ab0f55c45bf':
Added a check if a custom activity can be started
Fyodor Kupolov [Thu, 29 Jan 2015 18:31:45 +0000 (18:31 +0000)]
am
9fce9185: am
bd89b7b4: am
0d5ad3b7: am
57641a8b: am
d7e93570: am
f11f9f47: Added a check if a custom activity can be started
* commit '
9fce9185513ebaf551ded3937c2767f9ed7bea0f':
Added a check if a custom activity can be started
Fyodor Kupolov [Thu, 29 Jan 2015 18:24:21 +0000 (18:24 +0000)]
am
bd89b7b4: am
0d5ad3b7: am
57641a8b: am
d7e93570: am
f11f9f47: Added a check if a custom activity can be started
* commit '
bd89b7b45ef9572c5e8523f0c8bd723958847df5':
Added a check if a custom activity can be started
Fyodor Kupolov [Thu, 29 Jan 2015 18:19:06 +0000 (18:19 +0000)]
am
0d5ad3b7: am
57641a8b: am
d7e93570: am
f11f9f47: Added a check if a custom activity can be started
* commit '
0d5ad3b73ef524b4aa09e86d3c3a68b48be0d1d1':
Added a check if a custom activity can be started
Fyodor Kupolov [Thu, 29 Jan 2015 18:12:42 +0000 (18:12 +0000)]
am
d7e93570: am
f11f9f47: Added a check if a custom activity can be started
automerge:
57641a8
* commit '
57641a8b5080b5122fcdd98c56fffaef90b3992d':
Added a check if a custom activity can be started
Fyodor Kupolov [Thu, 29 Jan 2015 18:12:04 +0000 (18:12 +0000)]
am
e3904c4f: am
e8e7b9b3: Added a check if a custom activity can be started
* commit '
e3904c4f09b1a828e2d1f2f3536cdc8eca84a6aa':
Added a check if a custom activity can be started
Fyodor Kupolov [Thu, 29 Jan 2015 18:09:29 +0000 (18:09 +0000)]
am
57641a8b: am
d7e93570: am
f11f9f47: Added a check if a custom activity can be started
* commit '
57641a8b5080b5122fcdd98c56fffaef90b3992d':
Added a check if a custom activity can be started
Fyodor Kupolov [Thu, 29 Jan 2015 18:02:40 +0000 (18:02 +0000)]
am
d7e93570: am
f11f9f47: Added a check if a custom activity can be started
* commit '
d7e93570d35cfec4e5de0f3edc5d326ecdb8a442':
Added a check if a custom activity can be started
OSDN Git Service
