OSDN Git Service
Robin Lee [Fri, 19 Jun 2015 21:40:34 +0000 (21:40 +0000)]
am
645c4e32: am
02a0cf3a: am
3a839be7: Merge "Only unregister the network callback at onPause" into mnc-dev
* commit '
645c4e327cda52b5dbc9560aece66edb075d7658':
Only unregister the network callback at onPause
Robin Lee [Fri, 19 Jun 2015 21:23:00 +0000 (21:23 +0000)]
am
02a0cf3a: am
3a839be7: Merge "Only unregister the network callback at onPause" into mnc-dev
* commit '
02a0cf3ae32a272eff23364f8202f6086fabd28e':
Only unregister the network callback at onPause
Robin Lee [Fri, 19 Jun 2015 20:10:51 +0000 (20:10 +0000)]
am
3a839be7: Merge "Only unregister the network callback at onPause" into mnc-dev
* commit '
3a839be7c165ea152179fb5b4531f4f6fdb7c822':
Only unregister the network callback at onPause
Robin Lee [Fri, 19 Jun 2015 20:03:05 +0000 (20:03 +0000)]
Merge "Only unregister the network callback at onPause" into mnc-dev
Jason Monk [Fri, 19 Jun 2015 16:26:37 +0000 (16:26 +0000)]
am
9c4c45b3: am
6a7c7562: am
d63e6969: Merge "Add content description to owner info status text" into mnc-dev
* commit '
9c4c45b34013514b4f8a734b3f8d146dc613e46b':
Add content description to owner info status text
John Spurlock [Fri, 19 Jun 2015 16:26:36 +0000 (16:26 +0000)]
am
5a148d1b: am
b9ea1310: am
7699cad0: Merge "Settings: Add widget entry point to magical entry points listing." into mnc-dev
* commit '
5a148d1bc210256c74d45e25cae59f5eb27c931b':
Settings: Add widget entry point to magical entry points listing.
Jason Monk [Fri, 19 Jun 2015 16:15:37 +0000 (16:15 +0000)]
am
6a7c7562: am
d63e6969: Merge "Add content description to owner info status text" into mnc-dev
* commit '
6a7c756208555a41b4433b3a0ce12ef1c101215c':
Add content description to owner info status text
John Spurlock [Fri, 19 Jun 2015 16:15:25 +0000 (16:15 +0000)]
am
b9ea1310: am
7699cad0: Merge "Settings: Add widget entry point to magical entry points listing." into mnc-dev
* commit '
b9ea1310441d8602b4a51e1c1746e88e45dbc745':
Settings: Add widget entry point to magical entry points listing.
Jason Monk [Fri, 19 Jun 2015 15:33:37 +0000 (15:33 +0000)]
am
d63e6969: Merge "Add content description to owner info status text" into mnc-dev
* commit '
d63e696902cbefaa7361aaa16e6b20d0fe593cdb':
Add content description to owner info status text
Jason Monk [Fri, 19 Jun 2015 15:22:20 +0000 (15:22 +0000)]
Merge "Add content description to owner info status text" into mnc-dev
Jason Monk [Fri, 19 Jun 2015 15:17:03 +0000 (11:17 -0400)]
Add content description to owner info status text
Bug:
21799551
Change-Id: I8fe82d304309949a5a46492f7d20c58e006baea3
John Spurlock [Fri, 19 Jun 2015 15:03:16 +0000 (15:03 +0000)]
am
7699cad0: Merge "Settings: Add widget entry point to magical entry points listing." into mnc-dev
* commit '
7699cad0042b8bc8cf3cd5ca728f013abe175de8':
Settings: Add widget entry point to magical entry points listing.
John Spurlock [Fri, 19 Jun 2015 14:55:10 +0000 (14:55 +0000)]
Merge "Settings: Add widget entry point to magical entry points listing." into mnc-dev
John Spurlock [Fri, 19 Jun 2015 14:47:36 +0000 (10:47 -0400)]
Settings: Add widget entry point to magical entry points listing.
Bug:
21930077
Change-Id: I67b05d6064a2ab0fe93d3d8841c9f23c9246a101
Brian Carlstrom [Fri, 19 Jun 2015 14:18:37 +0000 (14:18 +0000)]
am
34e39e7c: am
9dca3951: am
2567514a: Merge "Clarify process_dex2oat_label description" into mnc-dev
* commit '
34e39e7cff699c9fb38c3d92276099ef99e97de8':
Clarify process_dex2oat_label description
Sanket Padawe [Fri, 19 Jun 2015 14:18:35 +0000 (14:18 +0000)]
am
4ad7f625: am
aa10a9ec: am
5ba90c14: Increase char limit of the data usage Settings string to 33.
* commit '
4ad7f6254d195bd53369aa7fc5154f70d6fb42c3':
Increase char limit of the data usage Settings string to 33.
Brian Carlstrom [Fri, 19 Jun 2015 13:59:04 +0000 (13:59 +0000)]
am
9dca3951: am
2567514a: Merge "Clarify process_dex2oat_label description" into mnc-dev
* commit '
9dca3951f6abd2644b899c34c930da0456b7f814':
Clarify process_dex2oat_label description
Sanket Padawe [Fri, 19 Jun 2015 13:58:57 +0000 (13:58 +0000)]
am
aa10a9ec: am
5ba90c14: Increase char limit of the data usage Settings string to 33.
* commit '
aa10a9ec83a639498a1fe5ff483f05a668cdf773':
Increase char limit of the data usage Settings string to 33.
Brian Carlstrom [Fri, 19 Jun 2015 04:33:16 +0000 (04:33 +0000)]
am
2567514a: Merge "Clarify process_dex2oat_label description" into mnc-dev
* commit '
2567514abcd253cdc857ef0ddb2dbbb4fe6eed08':
Clarify process_dex2oat_label description
Brian Carlstrom [Fri, 19 Jun 2015 04:23:07 +0000 (04:23 +0000)]
Merge "Clarify process_dex2oat_label description" into mnc-dev
Sanket Padawe [Fri, 19 Jun 2015 01:51:27 +0000 (01:51 +0000)]
am
5ba90c14: Increase char limit of the data usage Settings string to 33.
* commit '
5ba90c148d41ae3f330d7f31de8bced5e21c8727':
Increase char limit of the data usage Settings string to 33.
Sanket Padawe [Fri, 19 Jun 2015 01:39:25 +0000 (18:39 -0700)]
Increase char limit of the data usage Settings string to 33.
Bug:
21801556
Change-Id: I82d99f155a3c4b6f1ac0f3056c254e54b8e5f311
Jason Monk [Thu, 18 Jun 2015 20:43:09 +0000 (20:43 +0000)]
am
8a753643: am
5fd5890f: am
47a26c79: Merge "Fix ListView being too eager too scroll" into mnc-dev
* commit '
8a753643058760fb44a286dbf7d198053a3f3a01':
Fix ListView being too eager too scroll
Jason Monk [Thu, 18 Jun 2015 20:30:36 +0000 (20:30 +0000)]
am
5fd5890f: am
47a26c79: Merge "Fix ListView being too eager too scroll" into mnc-dev
* commit '
5fd5890f5b94d102d7cf655fd0d1dbd9d09dd55f':
Fix ListView being too eager too scroll
Jason Monk [Thu, 18 Jun 2015 20:16:51 +0000 (20:16 +0000)]
am
47a26c79: Merge "Fix ListView being too eager too scroll" into mnc-dev
* commit '
47a26c79288723b8604a91c5cd8daedd83f183f2':
Fix ListView being too eager too scroll
Jason Monk [Thu, 18 Jun 2015 20:07:40 +0000 (20:07 +0000)]
Merge "Fix ListView being too eager too scroll" into mnc-dev
Jason Monk [Thu, 18 Jun 2015 19:56:21 +0000 (15:56 -0400)]
Fix ListView being too eager too scroll
ListView is always too eager to scroll, so just stop using it.
Bug:
21853796
Change-Id: Id37d89b0312597a9fb65a33f151af34b3f395d91
Jason Monk [Thu, 18 Jun 2015 19:55:32 +0000 (19:55 +0000)]
am
aa5964de: am
beaae836: am
6c5b27e0: Merge "Fix opening secured networks from QS" into mnc-dev
* commit '
aa5964de3768703de9dfa88fb7aa66ece7a353fe':
Fix opening secured networks from QS
Jason Monk [Thu, 18 Jun 2015 19:37:34 +0000 (19:37 +0000)]
am
beaae836: am
6c5b27e0: Merge "Fix opening secured networks from QS" into mnc-dev
* commit '
beaae8367ad41ff20ada95e621e488384b1730e3':
Fix opening secured networks from QS
Jason Monk [Thu, 18 Jun 2015 19:29:48 +0000 (19:29 +0000)]
am
6c5b27e0: Merge "Fix opening secured networks from QS" into mnc-dev
* commit '
6c5b27e042b5d36f404f11da85145a287a6f1df4':
Fix opening secured networks from QS
Jason Monk [Thu, 18 Jun 2015 19:19:08 +0000 (19:19 +0000)]
Merge "Fix opening secured networks from QS" into mnc-dev
Alex Chau [Thu, 18 Jun 2015 17:47:27 +0000 (17:47 +0000)]
am
ee6ffccb: am
1e24271a: am
cd0da9c1: Merge "Enforce Keyguard policy in Notification Settings" into mnc-dev
* commit '
ee6ffccbc7ff4015597da1fcc725456117a3141c':
Enforce Keyguard policy in Notification Settings
Alex Chau [Thu, 18 Jun 2015 17:35:55 +0000 (17:35 +0000)]
am
1e24271a: am
cd0da9c1: Merge "Enforce Keyguard policy in Notification Settings" into mnc-dev
* commit '
1e24271a9bee773911b630637c7096613d825a27':
Enforce Keyguard policy in Notification Settings
Alex Chau [Thu, 18 Jun 2015 17:22:23 +0000 (17:22 +0000)]
am
cd0da9c1: Merge "Enforce Keyguard policy in Notification Settings" into mnc-dev
* commit '
cd0da9c14ef11bdaca1a470fb1d87042d51f9ae7':
Enforce Keyguard policy in Notification Settings
Brian Carlstrom [Thu, 18 Jun 2015 17:11:18 +0000 (10:11 -0700)]
Clarify process_dex2oat_label description
Bug:
21898104
Change-Id: I264f784db761ac51a1dde51f189fb017b7d378b1
Alex Chau [Thu, 18 Jun 2015 17:10:34 +0000 (17:10 +0000)]
Merge "Enforce Keyguard policy in Notification Settings" into mnc-dev
Jason Monk [Thu, 18 Jun 2015 16:36:34 +0000 (12:36 -0400)]
Fix opening secured networks from QS
Bug:
21908788
Change-Id: I09b1d22ae8b1815e720bd8c05fa1e38d66d1dcfd
Jason Monk [Thu, 18 Jun 2015 16:32:55 +0000 (16:32 +0000)]
am
beab783c: am
6afa2a51: am
ed672cfc: Merge "Revert "Accounts -> Account sync"" into mnc-dev
* commit '
beab783cfddd8b31e3406cfbaa9b180d553f4a33':
Revert "Accounts -> Account sync"
Jason Monk [Thu, 18 Jun 2015 16:20:26 +0000 (16:20 +0000)]
am
6afa2a51: am
ed672cfc: Merge "Revert "Accounts -> Account sync"" into mnc-dev
* commit '
6afa2a51245cf026ba1606098d65db6d958da1c6':
Revert "Accounts -> Account sync"
Jason Monk [Thu, 18 Jun 2015 16:12:00 +0000 (16:12 +0000)]
am
e707ea37: am
a0336eb4: am
1a129e0f: Merge "Remove battery history graph from details screen" into mnc-dev
* commit '
e707ea3720188599385be2abaa9efbdf14f0560c':
Remove battery history graph from details screen
Jason Monk [Thu, 18 Jun 2015 16:11:59 +0000 (16:11 +0000)]
am
f99a90d1: am
eddd983d: am
58f6728e: Allow give/take in app version/disabled fields
* commit '
f99a90d13979525882ec4e6599b423c73fab5643':
Allow give/take in app version/disabled fields
Junda Liu [Thu, 18 Jun 2015 16:11:58 +0000 (16:11 +0000)]
am
5410a176: am
3d9ccb0f: am
2c55f738: Merge "Don\'t show SIM lock Setting if carrier config hides it." into mnc-dev
* commit '
5410a1769821c016f869493c638f18a8f2a79bf0':
Don't show SIM lock Setting if carrier config hides it.
Jason Monk [Thu, 18 Jun 2015 16:11:49 +0000 (16:11 +0000)]
am
ed672cfc: Merge "Revert "Accounts -> Account sync"" into mnc-dev
* commit '
ed672cfc8c3acb8b5d3fe932e1b31e20b32594c8':
Revert "Accounts -> Account sync"
Jason Monk [Thu, 18 Jun 2015 15:54:55 +0000 (15:54 +0000)]
Merge "Revert "Accounts -> Account sync"" into mnc-dev
Jason Monk [Thu, 18 Jun 2015 15:49:19 +0000 (15:49 +0000)]
am
a0336eb4: am
1a129e0f: Merge "Remove battery history graph from details screen" into mnc-dev
* commit '
a0336eb47f6256af21fb4b8e3597e04281839d1d':
Remove battery history graph from details screen
Jason Monk [Thu, 18 Jun 2015 15:49:16 +0000 (15:49 +0000)]
am
eddd983d: am
58f6728e: Allow give/take in app version/disabled fields
* commit '
eddd983de58b0fc5499e06591fa3750ff3d7292b':
Allow give/take in app version/disabled fields
Junda Liu [Thu, 18 Jun 2015 15:49:13 +0000 (15:49 +0000)]
am
3d9ccb0f: am
2c55f738: Merge "Don\'t show SIM lock Setting if carrier config hides it." into mnc-dev
* commit '
3d9ccb0ff45a981a784a8807410c8a8bc1842cf2':
Don't show SIM lock Setting if carrier config hides it.
Jason Monk [Thu, 18 Jun 2015 15:44:25 +0000 (15:44 +0000)]
Revert "Accounts -> Account sync"
This reverts commit
43db745ea0bdb3f8cb2737e74ffcad1d381b4a2b.
Bug:
21726868
Change-Id: I72fd09c493f71a607b9df8eaa8e42047a60303e8
Jason Monk [Thu, 18 Jun 2015 15:41:36 +0000 (15:41 +0000)]
am
1a129e0f: Merge "Remove battery history graph from details screen" into mnc-dev
* commit '
1a129e0fbb2fdfc4f5b7bda82a457e907a4aeb4f':
Remove battery history graph from details screen
Jason Monk [Thu, 18 Jun 2015 15:41:35 +0000 (15:41 +0000)]
am
58f6728e: Allow give/take in app version/disabled fields
* commit '
58f6728e6ef8c89d9b88d78b19b2d0f24135564d':
Allow give/take in app version/disabled fields
Junda Liu [Thu, 18 Jun 2015 15:41:33 +0000 (15:41 +0000)]
am
2c55f738: Merge "Don\'t show SIM lock Setting if carrier config hides it." into mnc-dev
* commit '
2c55f738c4336a3f379f94f4142c20a473ae3a9a':
Don't show SIM lock Setting if carrier config hides it.
Jason Monk [Thu, 18 Jun 2015 15:31:22 +0000 (15:31 +0000)]
Merge "Remove battery history graph from details screen" into mnc-dev
Jason Monk [Thu, 18 Jun 2015 15:06:18 +0000 (11:06 -0400)]
Remove battery history graph from details screen
Bug:
21854416
Change-Id: I3172106c8b1adbe19179adddcec2848d14d04588
Alex Chau [Fri, 12 Jun 2015 10:45:08 +0000 (11:45 +0100)]
Enforce Keyguard policy in Notification Settings
- Applied getKeyguardDisabledFeatures for notification settings and
notification setup page (after settings a screenlock)
- If a notification settings is disabled, the next least secure setting
will be chosen
- Although KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS can be set be
profile, it will not be reflected in both settings page. This is
because it does not affect the owner (user 0), as mentioned in
DevicePolicyManagerService.PROFILE_KEYGUARD_FEATURES_AFFECT_OWNER
- Skip RedactionInterstitial if there is <= 1 options for the user
- Tested with both Setup wizard and settings case, both pattern and
password, as well as toggling the policy on and off
Bug:
19307118
Bug:
17099898
Change-Id: If640d5576caa0163e9942569f7b4643a30bbfe0a
Jason Monk [Thu, 18 Jun 2015 14:36:39 +0000 (10:36 -0400)]
Allow give/take in app version/disabled fields
Switch to wrap_content so if one view is smaller, the other
can use its space.
Bug:
21901206
Change-Id: Ic69d2577c3291e6ed171caa0fa361ccc43eaf180
Robin Lee [Thu, 18 Jun 2015 01:43:59 +0000 (18:43 -0700)]
Only unregister the network callback at onPause
Bug:
21592804
Change-Id: I425a8ebd350125ae48b9cf44cfef0b4c572ec25e
Junda Liu [Wed, 17 Jun 2015 22:50:59 +0000 (22:50 +0000)]
Merge "Don't show SIM lock Setting if carrier config hides it." into mnc-dev
Junda Liu [Wed, 17 Jun 2015 17:15:34 +0000 (10:15 -0700)]
Don't show SIM lock Setting if carrier config hides it.
Bug: b/
19623656
Change-Id: Ic7420fe3579815a8c2c884a78b13112affb00787
Jason Monk [Wed, 17 Jun 2015 20:59:55 +0000 (20:59 +0000)]
am
1c8a483c: am
a82961f1: am
f8577c68: Merge "Support disabled until used apps" into mnc-dev
* commit '
1c8a483cb662da6b6aa685558e0058bebdc13251':
Support disabled until used apps
Jason Monk [Wed, 17 Jun 2015 20:59:54 +0000 (20:59 +0000)]
am
f5269f3b: am
c3570166: am
2ab42701: Merge "Fix accessibility for empty list on notification access" into mnc-dev
* commit '
f5269f3bdedc9bb3087732e589a4f4c0ad18e63d':
Fix accessibility for empty list on notification access
Jason Monk [Wed, 17 Jun 2015 20:53:32 +0000 (20:53 +0000)]
am
a82961f1: am
f8577c68: Merge "Support disabled until used apps" into mnc-dev
* commit '
a82961f108e18eaefb836f83fe1508c706a563b1':
Support disabled until used apps
Jason Monk [Wed, 17 Jun 2015 20:53:31 +0000 (20:53 +0000)]
am
c3570166: am
2ab42701: Merge "Fix accessibility for empty list on notification access" into mnc-dev
* commit '
c3570166c2484f76e73e76eecdf8cd2870d1a0ac':
Fix accessibility for empty list on notification access
Jason Monk [Wed, 17 Jun 2015 20:41:36 +0000 (20:41 +0000)]
am
f8577c68: Merge "Support disabled until used apps" into mnc-dev
* commit '
f8577c68afbf4965211ca99233f7c5e40560e566':
Support disabled until used apps
Jason Monk [Wed, 17 Jun 2015 20:41:34 +0000 (20:41 +0000)]
am
2ab42701: Merge "Fix accessibility for empty list on notification access" into mnc-dev
* commit '
2ab427010ae16af8756347cefac6350ce83041e8':
Fix accessibility for empty list on notification access
Jason Monk [Wed, 17 Jun 2015 20:31:26 +0000 (20:31 +0000)]
Merge "Support disabled until used apps" into mnc-dev
Jason Monk [Wed, 17 Jun 2015 20:31:16 +0000 (20:31 +0000)]
Merge "Fix accessibility for empty list on notification access" into mnc-dev
Jason Monk [Wed, 17 Jun 2015 19:42:01 +0000 (15:42 -0400)]
Fix accessibility for empty list on notification access
Bug:
21797352
Change-Id: I6c68c9abb43c6dfcc8b0a4d07cfe0d4cede6e817
Makoto Onuki [Wed, 17 Jun 2015 18:23:21 +0000 (18:23 +0000)]
am
1cc4bd33: am
a42d94d8: am
9f2b5a74: Merge "Don\'t crash on NameNotFoundException" into mnc-dev
* commit '
1cc4bd33265302cfdca55553a5fa746a8265aea7':
Don't crash on NameNotFoundException
Makoto Onuki [Wed, 17 Jun 2015 18:15:09 +0000 (18:15 +0000)]
am
a42d94d8: am
9f2b5a74: Merge "Don\'t crash on NameNotFoundException" into mnc-dev
* commit '
a42d94d82e72c5ef0e99cb9f755673c82e3f8955':
Don't crash on NameNotFoundException
Makoto Onuki [Wed, 17 Jun 2015 17:57:56 +0000 (17:57 +0000)]
am
9f2b5a74: Merge "Don\'t crash on NameNotFoundException" into mnc-dev
* commit '
9f2b5a74420988824dd3a91abcdb85bea6fc48fa':
Don't crash on NameNotFoundException
Makoto Onuki [Wed, 17 Jun 2015 17:46:49 +0000 (17:46 +0000)]
Merge "Don't crash on NameNotFoundException" into mnc-dev
Makoto Onuki [Wed, 17 Jun 2015 17:13:15 +0000 (10:13 -0700)]
Don't crash on NameNotFoundException
Just finish().
Bug
20672468
Change-Id: Ic600e060990b7e3bc3e98bda63d0f4c9e530fb94
Geoff Mendal [Wed, 17 Jun 2015 15:58:38 +0000 (15:58 +0000)]
am
6a28e257: (-s ours) am
7343ecc7: (-s ours) am
2eb7ad26: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
6a28e2573a210ecaf976e21cc5c4fddd75afa374':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 17 Jun 2015 15:44:51 +0000 (15:44 +0000)]
am
7343ecc7: (-s ours) am
2eb7ad26: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
7343ecc71fff3aae7ca1721a958d18850b7dc04e':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 17 Jun 2015 15:32:25 +0000 (15:32 +0000)]
am
2eb7ad26: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
2eb7ad2648e85f2474d271499ec43241264ca148':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 17 Jun 2015 15:23:33 +0000 (15:23 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 17 Jun 2015 14:59:14 +0000 (07:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1ec85dbe877d7fae6edf1f93ec812bc7b1223daa
Auto-generated-cl: translation import
Geoff Mendal [Wed, 17 Jun 2015 14:29:22 +0000 (14:29 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 17 Jun 2015 14:27:41 +0000 (07:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: I74442ac6e0aab88878469be16d6518bd1af75861
Auto-generated-cl: translation import
Jason Monk [Wed, 17 Jun 2015 13:58:35 +0000 (13:58 +0000)]
am
f424ccf7: (-s ours) am
5c2de952: am
7fdb1478: RIP -night DO NOT MERGE
* commit '
f424ccf7433be32c9bf9c29d388beb0e6fe94267':
RIP -night DO NOT MERGE
Jason Monk [Wed, 17 Jun 2015 13:47:00 +0000 (13:47 +0000)]
am
5c2de952: am
7fdb1478: RIP -night DO NOT MERGE
* commit '
5c2de952e5e7f2501df7a5a94794e526902e47a3':
RIP -night DO NOT MERGE
Jason Monk [Wed, 17 Jun 2015 13:37:31 +0000 (13:37 +0000)]
am
7fdb1478: RIP -night DO NOT MERGE
* commit '
7fdb1478728ed7eaab956da476540b3e9c97b9b3':
RIP -night DO NOT MERGE
Jason Monk [Wed, 17 Jun 2015 13:32:58 +0000 (13:32 +0000)]
am
840164a2: am
2abd5be3: am
7a5cb3b9: Merge "Guard against callbacks when no list view created" into mnc-dev
* commit '
840164a21ce2fa6638e4e2175bb1e36d4335f4a1':
Guard against callbacks when no list view created
Jason Monk [Wed, 17 Jun 2015 13:23:09 +0000 (13:23 +0000)]
am
2abd5be3: am
7a5cb3b9: Merge "Guard against callbacks when no list view created" into mnc-dev
* commit '
2abd5be388fe29e0a70a4e69f95d6dcc56004a58':
Guard against callbacks when no list view created
Jason Monk [Wed, 17 Jun 2015 13:17:31 +0000 (09:17 -0400)]
RIP -night DO NOT MERGE
Bug:
21854466
Change-Id: Ied1512cb1d8c80df9f6c990f8f91f82d7f140533
Jason Monk [Wed, 17 Jun 2015 13:09:18 +0000 (13:09 +0000)]
am
7a5cb3b9: Merge "Guard against callbacks when no list view created" into mnc-dev
* commit '
7a5cb3b9c34af2215bdaaddba976f04bbafd06eb':
Guard against callbacks when no list view created
Jason Monk [Wed, 17 Jun 2015 13:01:27 +0000 (13:01 +0000)]
Merge "Guard against callbacks when no list view created" into mnc-dev
Jeff Sharkey [Wed, 17 Jun 2015 03:54:31 +0000 (03:54 +0000)]
am
a39077c9: am
67832cc3: am
74c7f1fc: Merge "Actually gracefully finish this time around." into mnc-dev
* commit '
a39077c95bb51102e77e55a2d4e352f8027d5c24':
Actually gracefully finish this time around.
Jeff Sharkey [Wed, 17 Jun 2015 03:45:06 +0000 (03:45 +0000)]
am
67832cc3: am
74c7f1fc: Merge "Actually gracefully finish this time around." into mnc-dev
* commit '
67832cc3984665cf55ac3d4afc5fdbb76326f1a0':
Actually gracefully finish this time around.
Jeff Sharkey [Wed, 17 Jun 2015 03:31:44 +0000 (03:31 +0000)]
am
74c7f1fc: Merge "Actually gracefully finish this time around." into mnc-dev
* commit '
74c7f1fcd3451bdb5b49f2b44b86fd4ec8eb6794':
Actually gracefully finish this time around.
Jeff Sharkey [Wed, 17 Jun 2015 03:23:58 +0000 (03:23 +0000)]
Merge "Actually gracefully finish this time around." into mnc-dev
Jeff Sharkey [Wed, 17 Jun 2015 03:11:44 +0000 (20:11 -0700)]
Actually gracefully finish this time around.
Also fix tinting on front-door icon.
Bug:
21403958
Change-Id: I74f0372a41b92235abe10391f36d9f6a1e6a40c5
Jim Miller [Wed, 17 Jun 2015 00:33:52 +0000 (00:33 +0000)]
am
8b5943c2: am
dd0d9854: am
4b60af78: Merge "Fix issue with german translation of lock times" into mnc-dev
* commit '
8b5943c2fb4d069797df0c1a4b43f2d604eb6385':
Fix issue with german translation of lock times
Jim Miller [Wed, 17 Jun 2015 00:20:35 +0000 (00:20 +0000)]
am
dd0d9854: am
4b60af78: Merge "Fix issue with german translation of lock times" into mnc-dev
* commit '
dd0d9854a5e4e946e8cb55a91148f17e4424836f':
Fix issue with german translation of lock times
Jeff Sharkey [Wed, 17 Jun 2015 00:20:02 +0000 (00:20 +0000)]
am
122b4d73: am
2ef947be: am
4e42cbdb: Merge "Gracefully finish when missing volume." into mnc-dev
* commit '
122b4d735f2f83ead436f4d6067ad1718c701004':
Gracefully finish when missing volume.
Jim Miller [Wed, 17 Jun 2015 00:09:52 +0000 (00:09 +0000)]
am
4b60af78: Merge "Fix issue with german translation of lock times" into mnc-dev
* commit '
4b60af78fa8b0c474c9aee0f03171867843d2838':
Fix issue with german translation of lock times
Jeff Sharkey [Wed, 17 Jun 2015 00:09:43 +0000 (00:09 +0000)]
am
2ef947be: am
4e42cbdb: Merge "Gracefully finish when missing volume." into mnc-dev
* commit '
2ef947be79e6ecf5d5e8acfb054247a8902d7993':
Gracefully finish when missing volume.
Jim Miller [Tue, 16 Jun 2015 23:59:36 +0000 (23:59 +0000)]
Merge "Fix issue with german translation of lock times" into mnc-dev
Jeff Sharkey [Tue, 16 Jun 2015 23:56:37 +0000 (23:56 +0000)]
am
4e42cbdb: Merge "Gracefully finish when missing volume." into mnc-dev
* commit '
4e42cbdba386a742b01871010ec8747e07471e29':
Gracefully finish when missing volume.
Jeff Sharkey [Tue, 16 Jun 2015 23:48:06 +0000 (23:48 +0000)]
Merge "Gracefully finish when missing volume." into mnc-dev
OSDN Git Service
