OSDN Git Service
Jason Monk [Thu, 21 May 2015 20:26:21 +0000 (20:26 +0000)]
am
ce6f1651: Merge "Fix loading screen one more time" into mnc-dev
* commit '
ce6f165104fb8c567c13369bae97935e29c47f4c':
Fix loading screen one more time
Jason Monk [Thu, 21 May 2015 20:13:37 +0000 (20:13 +0000)]
Merge "Fix loading screen one more time" into mnc-dev
Jason Monk [Thu, 21 May 2015 20:03:37 +0000 (16:03 -0400)]
Fix loading screen one more time
Don't rebuild the app list until the entry load is complete to avoid
having a slowly populating list shown to the user.
Bug:
21086054
Change-Id: I801ab292fdbf6801c1b9c8f957336660810da5f6
Xiyuan Xia [Thu, 21 May 2015 16:22:30 +0000 (16:22 +0000)]
am
a0e052b1: Merge "Do not show soft keyboard when locked out" into mnc-dev
* commit '
a0e052b17b0c730dcd61ad2787c041c75107f106':
Do not show soft keyboard when locked out
Xiyuan Xia [Thu, 21 May 2015 16:16:06 +0000 (16:16 +0000)]
Merge "Do not show soft keyboard when locked out" into mnc-dev
Jason Monk [Thu, 21 May 2015 13:05:57 +0000 (13:05 +0000)]
am
b2e07cd0: Merge "Remove data item from app info when not supported" into mnc-dev
* commit '
b2e07cd0f9e2a869710c6b713f403afc4fbdbfab':
Remove data item from app info when not supported
Jason Monk [Thu, 21 May 2015 12:55:31 +0000 (12:55 +0000)]
Merge "Remove data item from app info when not supported" into mnc-dev
Jason Monk [Wed, 20 May 2015 17:35:43 +0000 (13:35 -0400)]
Remove data item from app info when not supported
Bug:
21207963
Change-Id: I91693d9a85c0905cbb021181967fa16aac61d3ea
Geoff Mendal [Thu, 21 May 2015 03:30:37 +0000 (03:30 +0000)]
am
462e7008: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
462e70083fbdd12da55b6a6b98a59750d250f40d':
Import translations. DO NOT MERGE
John Spurlock [Thu, 21 May 2015 03:30:36 +0000 (03:30 +0000)]
am
fffa7f90: Merge "Settings: Auto-capitalize edit text for zen autorule names." into mnc-dev
* commit '
fffa7f905b809659c3edbbb1663f3a74ce5625bc':
Settings: Auto-capitalize edit text for zen autorule names.
Geoff Mendal [Thu, 21 May 2015 03:26:56 +0000 (03:26 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Thu, 21 May 2015 03:20:56 +0000 (20:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibf8eea922fe4322ec29f6837bfb399c85b4cfbcf
Auto-generated-cl: translation import
John Spurlock [Thu, 21 May 2015 03:19:19 +0000 (03:19 +0000)]
Merge "Settings: Auto-capitalize edit text for zen autorule names." into mnc-dev
John Spurlock [Thu, 21 May 2015 03:14:49 +0000 (23:14 -0400)]
Settings: Auto-capitalize edit text for zen autorule names.
Bug:
21337479
Change-Id: I424adf94a0717cb4ca75576e2047cbaf387bb947
Xiyuan Xia [Wed, 20 May 2015 21:26:15 +0000 (14:26 -0700)]
Do not show soft keyboard when locked out
- Remove stateVisible for ConfirmLockPassword activity so that
soft keyboard does not auto show up when the activity starts;
- Programatically show/hide soft keyboard when ConfirmLockPassword
activity window gains focus;
Bug:
20542149
Change-Id: I3faa20312d2d25752bd35b70dc8ed785e7687f0a
Jorim Jaggi [Wed, 20 May 2015 19:11:45 +0000 (19:11 +0000)]
am
b56a1036: Merge "Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (2/2)" into mnc-dev
* commit '
b56a10368fa3b7f2a359c8cf4a7abf1ba7edf232':
Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (2/2)
Jorim Jaggi [Wed, 20 May 2015 19:01:49 +0000 (19:01 +0000)]
Merge "Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (2/2)" into mnc-dev
Lorenzo Colitti [Wed, 20 May 2015 09:47:41 +0000 (09:47 +0000)]
am
f675409e: Merge "Address TODOs in WifiNoInternetDialog." into mnc-dev
* commit '
f675409e238bcd3df44fe0026a49e89cd30a5bdf':
Address TODOs in WifiNoInternetDialog.
Lorenzo Colitti [Wed, 20 May 2015 08:04:42 +0000 (08:04 +0000)]
Merge "Address TODOs in WifiNoInternetDialog." into mnc-dev
Maurice Lam [Wed, 20 May 2015 01:50:50 +0000 (01:50 +0000)]
am
efbe4661: Merge "[LockScreen] Update initial string in choose lock screens" into mnc-dev
* commit '
efbe46612d3253e683ec14cadabf638450b39486':
[LockScreen] Update initial string in choose lock screens
Maurice Lam [Wed, 20 May 2015 01:42:42 +0000 (01:42 +0000)]
Merge "[LockScreen] Update initial string in choose lock screens" into mnc-dev
Maurice Lam [Wed, 20 May 2015 00:27:12 +0000 (17:27 -0700)]
[LockScreen] Update initial string in choose lock screens
In choose password and PIN screens, change the initial string from
duplicate of the title ("Choose your password/PIN") to the
verification string ("PIN must be at least ? digits" / "Password must
be at least ? characters").
Bug:
20948877
Change-Id: I635ec625f2820e522cdfc983e13ee71706e7004e
Fyodor Kupolov [Tue, 19 May 2015 21:47:04 +0000 (21:47 +0000)]
am
c80084e5: Merge "Added SearchIndexProvider for UserSettings" into mnc-dev
* commit '
c80084e55afeaeebfb0546c0112fb2e666e35700':
Added SearchIndexProvider for UserSettings
Fyodor Kupolov [Tue, 19 May 2015 21:44:17 +0000 (21:44 +0000)]
Merge "Added SearchIndexProvider for UserSettings" into mnc-dev
Jorim Jaggi [Tue, 19 May 2015 21:02:05 +0000 (14:02 -0700)]
Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (2/2)
Change-Id: I7623488349209248596827d03fd77cd128f8b2b4
Jeff Sharkey [Tue, 19 May 2015 19:10:53 +0000 (19:10 +0000)]
am
d0393cd0: Merge "Warn user when adopted device is slow." into mnc-dev
* commit '
d0393cd0417ecc8aed686578381745a88fb77f92':
Warn user when adopted device is slow.
Jeff Sharkey [Tue, 19 May 2015 19:03:34 +0000 (19:03 +0000)]
Merge "Warn user when adopted device is slow." into mnc-dev
Jeff Sharkey [Tue, 19 May 2015 18:22:33 +0000 (11:22 -0700)]
Warn user when adopted device is slow.
For now, warn user if benchmark takes longer than a simple threshold
of 2 seconds.
Bug:
21172095
Change-Id: I6d43ee93ac2ff669115519e6a856f8c314915a47
Xiyuan Xia [Tue, 19 May 2015 18:39:31 +0000 (18:39 +0000)]
am
3a310719: Merge "No input instead of disabling password/pin entry" into mnc-dev
* commit '
3a310719d816b8608cd51469c62231a1ed41a608':
No input instead of disabling password/pin entry
Fyodor Kupolov [Sat, 16 May 2015 00:16:15 +0000 (17:16 -0700)]
Added SearchIndexProvider for UserSettings
It enables customizations for certain cases like whether the user is able to
create restricted profiles or multiuser UI is disabled.
Bug:
21197002
Change-Id: Ia672c0f9bb451877f8debe04438b46cb2b7e9242
Xiyuan Xia [Tue, 19 May 2015 18:30:19 +0000 (18:30 +0000)]
Merge "No input instead of disabling password/pin entry" into mnc-dev
Guang Zhu [Tue, 19 May 2015 18:21:53 +0000 (18:21 +0000)]
am
ccfbb1d6: Merge "Monkey should not be allowed to switch USB mode" into mnc-dev
* commit '
ccfbb1d6ca30dd495938a6e68ca02410e7ffb6c7':
Monkey should not be allowed to switch USB mode
Guang Zhu [Tue, 19 May 2015 18:14:45 +0000 (18:14 +0000)]
Merge "Monkey should not be allowed to switch USB mode" into mnc-dev
Guang Zhu [Tue, 19 May 2015 18:08:39 +0000 (11:08 -0700)]
Monkey should not be allowed to switch USB mode
Change-Id: Ifb4865d234e0d9e6453f88d37c12744b9daefa62
Nicolas Prevot [Tue, 19 May 2015 18:09:12 +0000 (18:09 +0000)]
am
e74fdb8d: Merge "Remove the check hasMultipleUsers in Settings." into mnc-dev
* commit '
e74fdb8d672a361f5a29cded65278054e1683fc6':
Remove the check hasMultipleUsers in Settings.
Jason Monk [Tue, 19 May 2015 18:09:11 +0000 (18:09 +0000)]
am
2b768522: Merge "Default ignore optimizations to show system apps" into mnc-dev
* commit '
2b7685224d1021a9e163a2ffc4bf4e8d38b56252':
Default ignore optimizations to show system apps
Nicolas Prevot [Tue, 19 May 2015 17:58:45 +0000 (17:58 +0000)]
Merge "Remove the check hasMultipleUsers in Settings." into mnc-dev
Jason Monk [Tue, 19 May 2015 17:57:13 +0000 (17:57 +0000)]
Merge "Default ignore optimizations to show system apps" into mnc-dev
Jason Monk [Tue, 19 May 2015 17:08:39 +0000 (13:08 -0400)]
Default ignore optimizations to show system apps
Bug:
21211422
Change-Id: Ied526cffa86406b8b81824cf2cdb03cc37bb7433
Lorenzo Colitti [Tue, 19 May 2015 15:37:38 +0000 (00:37 +0900)]
Address TODOs in WifiNoInternetDialog.
Bug:
20081183
Change-Id: I30a4f04ca892796a674ff0306aafaed485126092
Robin Lee [Tue, 19 May 2015 13:31:37 +0000 (13:31 +0000)]
am
196d0543: Merge "Badge managed WiFi networks" into mnc-dev
* commit '
196d0543737cef8fcf5e193af688a093a3743597':
Badge managed WiFi networks
Robin Lee [Tue, 19 May 2015 13:22:09 +0000 (13:22 +0000)]
Merge "Badge managed WiFi networks" into mnc-dev
Robin Lee [Tue, 19 May 2015 10:25:58 +0000 (10:25 +0000)]
am
b5c48a4c: Merge "VPN: UI for forgetting disconnected VPNs" into mnc-dev
* commit '
b5c48a4c347f7aa64b99e80370a63b3f60d3203c':
VPN: UI for forgetting disconnected VPNs
Robin Lee [Tue, 19 May 2015 10:14:55 +0000 (10:14 +0000)]
Merge "VPN: UI for forgetting disconnected VPNs" into mnc-dev
Jorim Jaggi [Tue, 19 May 2015 04:51:08 +0000 (04:51 +0000)]
am
a2138a34: Merge "Add setting to disable assist data (2/2)." into mnc-dev
* commit '
a2138a34852be7bcb793940269592ec5669cc3b4':
Add setting to disable assist data (2/2).
Try not to crash while AppInfo is finishing
Banish the memory page to Apps > Advanced
Fix crash when removing fingerprint
Fix bug #
21025020 Stability: JCs in Settings: Caused by: java.lang.NullPointerException
Jorim Jaggi [Tue, 19 May 2015 04:40:08 +0000 (04:40 +0000)]
Merge "Add setting to disable assist data (2/2)." into mnc-dev
Jorim Jaggi [Tue, 19 May 2015 00:36:50 +0000 (17:36 -0700)]
Add setting to disable assist data (2/2).
Bug:
20944446
Change-Id: I3c518176cab88ce9b5031a0241bee30240e6f896
Matthew Williams [Tue, 19 May 2015 01:31:47 +0000 (01:31 +0000)]
am
6ee5a4d0: Update Backup/reset UI
* commit '
6ee5a4d0ef0386d56c72a8ae81e65443fe5a2979':
Update Backup/reset UI
Matthew Williams [Sat, 16 May 2015 04:14:14 +0000 (21:14 -0700)]
Update Backup/reset UI
BUG:
20489775
Change-Id: I2c97fdf240ddd3e9f0a518478d5da91b91abe394
Tom O'Neill [Tue, 19 May 2015 00:55:39 +0000 (00:55 +0000)]
am
16a45baf: Merge "LocationSettings javadoc describes what\'s in the UI" into mnc-dev
* commit '
16a45bafa78f3a2cf2b37879c57441c608b03ab7':
LocationSettings javadoc describes what's in the UI
Tom O'Neill [Tue, 19 May 2015 00:44:36 +0000 (00:44 +0000)]
Merge "LocationSettings javadoc describes what's in the UI" into mnc-dev
Robin Lee [Tue, 12 May 2015 17:35:37 +0000 (18:35 +0100)]
VPN: UI for forgetting disconnected VPNs
Made possible by expanded internal VPN APIs.
Bug:
20872408
Bug:
20692490
Bug:
20747154
Change-Id: Idc87084a130afa18b27c85cc9d4b5033dcedaabe
xinhe [Mon, 18 May 2015 21:33:49 +0000 (21:33 +0000)]
am
512bb7e2: Merge "Rename config AP Band for Select AP Band" into mnc-dev
* commit '
512bb7e2e37512e22a466942dc7344dc12439648':
Rename config AP Band for Select AP Band
Jason Monk [Fri, 15 May 2015 17:05:46 +0000 (13:05 -0400)]
Try not to crash while AppInfo is finishing
Bug:
21025020
Change-Id: Iebb9e6b24ca503f87b5648f0aaf02dde01903488
xinhe [Mon, 18 May 2015 21:22:08 +0000 (21:22 +0000)]
Merge "Rename config AP Band for Select AP Band" into mnc-dev
xinhe [Mon, 18 May 2015 21:19:58 +0000 (14:19 -0700)]
Rename config AP Band for Select AP Band
Bug:
19095100
Change-Id: I18af303a56cf81b2a113c4a05e913dc7abbb88a8
Tom O'Neill [Mon, 18 May 2015 21:13:29 +0000 (14:13 -0700)]
LocationSettings javadoc describes what's in the UI
- In particular, tells OEMs how to add their own settings
Change-Id: I45e4fb7ff59705a2bcb53a72c71fd230f2e085c5
Sanket Padawe [Mon, 18 May 2015 21:10:23 +0000 (21:10 +0000)]
am
7186a47e: Check for special char when renaming device for Wi-Fi direct.
* commit '
7186a47ef348c17a985eb51ef74469a32c3c938d':
Check for special char when renaming device for Wi-Fi direct.
Xiyuan Xia [Fri, 15 May 2015 20:37:04 +0000 (13:37 -0700)]
No input instead of disabling password/pin entry
So that the keyboard does not come and go all the time.
Bug:
21271425
Change-Id: If73109fca1417c43307dc6069307789031ffc607
Sanket Padawe [Mon, 18 May 2015 18:39:01 +0000 (11:39 -0700)]
Check for special char when renaming device for Wi-Fi direct.
Bug:
21141820
Change-Id: I78231d95e5ba3f505325d5657f8e6106a887f11e
Robin Lee [Mon, 18 May 2015 09:10:30 +0000 (10:10 +0100)]
Badge managed WiFi networks
Bug:
19504806
Change-Id: I600b41e4bf6d336b7e091968560c6393041fc6b2
Jason Monk [Mon, 18 May 2015 13:34:56 +0000 (13:34 +0000)]
am
bbf031ab: Merge "Try not to crash while AppInfo is finishing" into mnc-dev
* commit '
bbf031ab09b445964acb5e7356ba407dd3dc2d33':
Try not to crash while AppInfo is finishing
Jason Monk [Mon, 18 May 2015 13:28:02 +0000 (13:28 +0000)]
Merge "Try not to crash while AppInfo is finishing" into mnc-dev
The Android Automerger [Mon, 18 May 2015 08:02:32 +0000 (01:02 -0700)]
merge in mnc-release history after reset to mnc-dev
Svet Ganov [Sun, 17 May 2015 11:23:50 +0000 (11:23 +0000)]
am
67e067ff: Hide platform platform legacy permissions behind a menu option - settings.
* commit '
67e067fff4e4ef1eb54f9c238dbf07312434a07e':
Hide platform platform legacy permissions behind a menu option - settings.
Svet Ganov [Sun, 17 May 2015 05:59:38 +0000 (22:59 -0700)]
Hide platform platform legacy permissions behind a menu option - settings.
bug:
21195624
Change-Id: Ib1dcfe2a15685c36e2a59e0921ea74d46ec9738c
The Android Automerger [Sat, 16 May 2015 08:03:47 +0000 (01:03 -0700)]
merge in mnc-release history after reset to mnc-dev
Jason Monk [Fri, 15 May 2015 15:35:45 +0000 (11:35 -0400)]
Banish the memory page to Apps > Advanced
Bug:
21129029
Change-Id: I5ea6c88505e553a4340e9c60377952af7e802a44
Jeff Sharkey [Fri, 15 May 2015 22:08:47 +0000 (22:08 +0000)]
am
11b29e76: Merge "Initial pass at storage benchmarks." into mnc-dev
* commit '
11b29e7613a30610981d56786fd5d2e0b7494aab':
Initial pass at storage benchmarks.
Jeff Sharkey [Fri, 15 May 2015 21:55:51 +0000 (21:55 +0000)]
Merge "Initial pass at storage benchmarks." into mnc-dev
Zoltan Szatmary-Ban [Fri, 15 May 2015 20:31:58 +0000 (20:31 +0000)]
am
cb5444ad: Merge "Reflect Wifi config lockdown restriction in Settings" into mnc-dev
* commit '
cb5444ad2ccf2f16bddafb8844cde6a1a92adddb':
Reflect Wifi config lockdown restriction in Settings
Zoltan Szatmary-Ban [Fri, 15 May 2015 20:22:34 +0000 (20:22 +0000)]
Merge "Reflect Wifi config lockdown restriction in Settings" into mnc-dev
Jason Monk [Fri, 15 May 2015 17:05:46 +0000 (13:05 -0400)]
Try not to crash while AppInfo is finishing
Bug:
21025020
Change-Id: Iebb9e6b24ca503f87b5648f0aaf02dde01903488
Jason Monk [Fri, 15 May 2015 16:26:33 +0000 (16:26 +0000)]
am
0c0e35ef: Banish the memory page to Apps > Advanced
* commit '
0c0e35ef3008e3b2c8c67d7454cbe46d3d848625':
Banish the memory page to Apps > Advanced
Jason Monk [Fri, 15 May 2015 15:35:45 +0000 (11:35 -0400)]
Banish the memory page to Apps > Advanced
Bug:
21129029
Change-Id: I5ea6c88505e553a4340e9c60377952af7e802a44
Jeff Sharkey [Fri, 15 May 2015 04:08:48 +0000 (21:08 -0700)]
Initial pass at storage benchmarks.
After adopting a disk, run benchmarks to compare its performance
against internal storage.
Bug:
21172095
Change-Id: I7c9a5a89e37f7156677fc76bd1ba193eead6665e
Matthew Williams [Fri, 15 May 2015 02:17:52 +0000 (02:17 +0000)]
am
5af3d6f5: Add strings for fullbackup data erase confirmation
* commit '
5af3d6f5cb95d654b963eae94155285e4e23a97e':
Add strings for fullbackup data erase confirmation
Matthew Williams [Fri, 15 May 2015 01:57:32 +0000 (18:57 -0700)]
Add strings for fullbackup data erase confirmation
Added a new string called fullbackup_erase_dialog_message which
will be displayed when the user has seen the "opted into dolly"
text.
Old string remains in place for the case where the user
hasn't seen the text.
BUG:
20489775
Change-Id: Id6675d1510cf1598f84fdfdcda7f6502a6cf6715
Jorim Jaggi [Wed, 13 May 2015 21:14:05 +0000 (14:14 -0700)]
Fix crash when removing fingerprint
Also fix a strings in fingerprint enrollment.
Bug:
21030545
Change-Id: I2d250b51a01f02bee014d4bc8e192d11199113e3
Svet Ganov [Thu, 14 May 2015 23:45:35 +0000 (23:45 +0000)]
am
3bd7db9f: Merge "Fix a typo." into mnc-dev
* commit '
3bd7db9f85a27f98f59b254764a41914905020d7':
Fix a typo.
Svet Ganov [Thu, 14 May 2015 23:29:27 +0000 (23:29 +0000)]
Merge "Fix a typo." into mnc-dev
Svet Ganov [Thu, 14 May 2015 23:27:46 +0000 (16:27 -0700)]
Fix a typo.
Change-Id: I38855b1f83d2524ff76b78a3109f18e128d803e1
Jorim Jaggi [Thu, 14 May 2015 22:20:33 +0000 (22:20 +0000)]
am
68d208e9: Merge "Fix crash when removing fingerprint" into mnc-dev
* commit '
68d208e9034a1e547d752a76f67a72680e380d07':
Fix crash when removing fingerprint
Jorim Jaggi [Thu, 14 May 2015 22:12:38 +0000 (22:12 +0000)]
Merge "Fix crash when removing fingerprint" into mnc-dev
Fabrice Di Meglio [Thu, 14 May 2015 21:51:07 +0000 (21:51 +0000)]
am
3fc7bfd9: Merge "Fix bug #
21025020 Stability: JCs in Settings: Caused by: java.lang.NullPointerException" into mnc-dev
* commit '
3fc7bfd9d9a4aa5b89b714ef18385366fde2b946':
Fix bug #
21025020 Stability: JCs in Settings: Caused by: java.lang.NullPointerException
Fabrice Di Meglio [Thu, 14 May 2015 21:20:45 +0000 (14:20 -0700)]
Fix bug #
21025020 Stability: JCs in Settings: Caused by: java.lang.NullPointerException
- prevent the NPE
Change-Id: Ief5a618e789e50eebcaa4386bd9ecec2192b4565
Fabrice Di Meglio [Thu, 14 May 2015 21:40:52 +0000 (21:40 +0000)]
Merge "Fix bug #
21025020 Stability: JCs in Settings: Caused by: java.lang.NullPointerException" into mnc-dev
Fabrice Di Meglio [Thu, 14 May 2015 21:20:45 +0000 (14:20 -0700)]
Fix bug #
21025020 Stability: JCs in Settings: Caused by: java.lang.NullPointerException
- prevent the NPE
Change-Id: Ief5a618e789e50eebcaa4386bd9ecec2192b4565
Nicolas Prevot [Thu, 14 May 2015 00:19:21 +0000 (17:19 -0700)]
Remove the check hasMultipleUsers in Settings.
When deciding to show the user section or not, Just rely
on supportsMultipleUsers. Don't check hasMultipleUsers.
BUG:
21119929
Change-Id: Ifbddac10e2f6dc02b8e2e55b41ab9f5be018dfca
Amith Yamasani [Thu, 14 May 2015 04:48:38 +0000 (04:48 +0000)]
Amith Yamasani [Thu, 14 May 2015 04:37:51 +0000 (21:37 -0700)]
Fix build
Change-Id: Id5c76cc0c9ead630d345a4ce173e3e9d141c1af9
Geoff Mendal [Thu, 14 May 2015 04:18:23 +0000 (04:18 +0000)]
am
78004ec6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
78004ec621e082e660a53c48ed4c06ed380764c7':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 14 May 2015 04:14:07 +0000 (04:14 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Amith Yamasani [Thu, 14 May 2015 04:14:06 +0000 (04:14 +0000)]
am
0327d483: Merge "Developer settings screen for inactive apps" into mnc-dev
* commit '
0327d483068e0ae286540e6315e6b32a98fbb41c':
Developer settings screen for inactive apps
Geoff Mendal [Thu, 14 May 2015 04:12:10 +0000 (21:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia831500abc9de4dd293c116e0a81f4bcccad0672
Auto-generated-cl: translation import
Amith Yamasani [Thu, 14 May 2015 04:04:54 +0000 (04:04 +0000)]
Merge "Developer settings screen for inactive apps" into mnc-dev
Sanket Padawe [Thu, 14 May 2015 02:43:40 +0000 (02:43 +0000)]
am
b331c393: Merge "Hotspot 2.0 UI for saved network." into mnc-dev
* commit '
b331c3937d07d44354bf882ae0e30e77aef9e875':
Hotspot 2.0 UI for saved network.
Geoff Mendal [Thu, 14 May 2015 02:43:38 +0000 (02:43 +0000)]
am
ecac0e55: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
ecac0e55906082fd1d1e65554a87625179ba7445':
Import translations. DO NOT MERGE
Sanket Padawe [Thu, 14 May 2015 02:40:36 +0000 (02:40 +0000)]
Merge "Hotspot 2.0 UI for saved network." into mnc-dev
Geoff Mendal [Thu, 14 May 2015 02:35:41 +0000 (02:35 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
OSDN Git Service
