Svetoslav
|
7f1267cd64
|
am d4f7908a: am c269be39: am e7416dbe: am 1154caa8: Merge "Crash in Settings cancelling a print job from the job list." into lmp-dev
* commit 'd4f7908a9816ab6b8bb4e6b41643bb8a1475ff07':
|
2014-10-27 20:38:13 +00:00 |
|
Vinit Deshpande
|
cf1485e4e2
|
am 9ff006b4: am 33812f49: am 749c39f0: am 9a8c58d4: Merge "Fix automatic Wi-fi toggle" into lmp-dev
* commit '9ff006b42127175e3c40cbaafe09f3262f66f057':
|
2014-10-27 20:38:12 +00:00 |
|
Zoltan Szatmary-Ban
|
0dcda11f19
|
am ab36fd98: am f8935010: am ddcb808b: am 6e1d8277: Merge "Show Power usage details for the correct user" into lmp-dev
* commit 'ab36fd983d77bb018dcbcf1e548409416ec014a1':
|
2014-10-27 20:38:11 +00:00 |
|
Matthew Xie
|
82fd86aa66
|
am 631dd2ea: am 231a8128: am 68f3653e: am 72c34e6a: Merge "Do not overwrite alias with device name" into lmp-dev
* commit '631dd2ea58bbb1729b169ec66dfefa1cd3dcbdd6':
|
2014-10-27 20:38:10 +00:00 |
|
PauloftheWest
|
fe6a4be3ca
|
am 0c32b376: am 58da4c37: am c932957d: am 0f01eeff: Merge "Removed an extraneous messge when pairing." into lmp-dev
* commit '0c32b376b81328de2c60c2cfcc6cd7e81dfdb4e0':
|
2014-10-27 20:38:09 +00:00 |
|
Sander Alewijnse
|
80264faed4
|
am ef888ead: am 0fe16796: am c995e733: am 4241b0a9: Merge "Update targetSdkVersion check." into lmp-dev
* commit 'ef888ead0d90231649f799f3424b1e3a14aee62f':
|
2014-10-27 20:38:08 +00:00 |
|
Mark Salyzyn
|
f58fae7cfe
|
am 54d56e6b: am 22955813: am 5f288bc1: am 894af268: logd: settings: ro.config.low_ram support
* commit '54d56e6bb325c07abf63eef9607b342bd9a58ddf':
|
2014-10-27 20:38:07 +00:00 |
|
Amith Yamasani
|
f5f7842b07
|
am 84af5ffd: am 2f8b4173: am ae2da7a9: am 69b67465: Merge "Don\'t allow creating a guest from a secondary user..." into lmp-dev
* commit '84af5ffd89ffdd9a695adb2dfdc3c7d4954c97b8':
|
2014-10-27 20:38:06 +00:00 |
|
John Spurlock
|
5ecad9cbdb
|
am 96cd9251: am ab4fe2d9: am 9e51261d: am ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev
* commit '96cd925174f6c678b4242ccd4d8b5ccee94a81fc':
|
2014-10-27 20:38:05 +00:00 |
|
PauloftheWest
|
cd9bf25db6
|
am 4a62d8e6: am 63f9500e: am 08183704: am 3cc81aea: Increase char limit for translation.
* commit '4a62d8e69f095b301ff323fba7bd87111cfb6c73':
|
2014-10-27 20:38:03 +00:00 |
|
Maurice Lam
|
6f2f7812fa
|
am 69ea67b6: am 2ffb10d2: am fd4e0f25: am 27d74fa2: Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev
* commit '69ea67b60ada436ace48ddf89539fb852d98e3ec':
|
2014-10-27 20:38:02 +00:00 |
|
Baligh Uddin
|
3ca01626ca
|
am 70aabfde: (-s ours) am fbb0218a: (-s ours) am 1741abb9: (-s ours) am 09a11d5b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '70aabfde6136de5684d6818728c5e41128f9a895':
|
2014-10-27 20:38:01 +00:00 |
|
PauloftheWest
|
2b88d51ccf
|
am a186ce83: am d1cd913a: am 9007cf63: am ec21e62a: Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev
* commit 'a186ce831f3f346a302ca1d3e69b4cbad9687610':
|
2014-10-27 20:38:00 +00:00 |
|
Edward Jee
|
863d8fc013
|
am 6fc08883: am 000dd0a6: am a99ef887: am ac8b5b7f: Migrates PBAP and MAP access permission data from Settings to Bluetooth.
* commit '6fc08883cebe328fd92f289502cfb73fe3c29f5a':
|
2014-10-27 20:37:59 +00:00 |
|
Edward Jee
|
22bc49035c
|
am cea371ca: am 32c56ed4: am 50b6eec9: am b0954c1d: Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev
* commit 'cea371caf2db6d0d5180e0dcf4100cf631aa3444':
|
2014-10-27 20:37:58 +00:00 |
|
PauloftheWest
|
115916a579
|
am 20cb5d91: am 8dee66d1: am 720af580: am 0ca0c8ad: Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev
* commit '20cb5d910138877b312c13f22385792402ac2c4a':
|
2014-10-27 20:37:57 +00:00 |
|
Dianne Hackborn
|
d7760f77ef
|
am b453421f: am 2acec676: am bf4ecab3: am 94aae9af: Little more on issue #17495264: tweak when we ignore initial times.
* commit 'b453421f92c0b43518cf15c9785c5dd4877225fc':
|
2014-10-27 20:37:56 +00:00 |
|
Dianne Hackborn
|
f0f7f1802a
|
am 6a300d00: am ff966f2a: am 829b9975: am ecffbc91: Merge "Fix issue #17495264: Battery history graph is bad" into lmp-dev
* commit '6a300d00aab43f123ace45e2fc70a573ab53d635':
|
2014-10-27 20:37:54 +00:00 |
|
Maurice Lam
|
c3189476dd
|
am 6476e981: am ea8db10a: am 0d09c6c1: am 795511ec: [WifiSetup] Disable app starting window
* commit '6476e98139459e49be4547d2cbcdf8087ef8d219':
|
2014-10-27 20:37:53 +00:00 |
|
PauloftheWest
|
2d7e3814c4
|
am c956628c: am f1fc7219: am 24233660: am 13fbd848: Merge "Updated Wi-Fi Settings icons to new filled-in teal format." into lmp-dev
* commit 'c956628c74b29078fb4a80352ac4080278e830c3':
|
2014-10-27 20:37:52 +00:00 |
|
Geoff Mendal
|
52732b3f40
|
am 56e62487: (-s ours) Import translations. DO NOT MERGE automerge: f571e51 -s ours
* commit '56e6248737ba2d090fc4826c5eb265a29776670d':
Import translations. DO NOT MERGE
|
2014-10-27 20:37:51 +00:00 |
|
Svetoslav
|
d4f7908a98
|
am c269be39: am e7416dbe: am 1154caa8: Merge "Crash in Settings cancelling a print job from the job list." into lmp-dev
* commit 'c269be392825341b29fa6b11047fc736e75580f2':
|
2014-10-27 18:52:15 +00:00 |
|
Vinit Deshpande
|
9ff006b421
|
am 33812f49: am 749c39f0: am 9a8c58d4: Merge "Fix automatic Wi-fi toggle" into lmp-dev
* commit '33812f4934c3c8a0e2d3aeb3f89625bdc9777f55':
|
2014-10-27 18:52:14 +00:00 |
|
Zoltan Szatmary-Ban
|
ab36fd983d
|
am f8935010: am ddcb808b: am 6e1d8277: Merge "Show Power usage details for the correct user" into lmp-dev
* commit 'f893501081fa2090315b70bd96ac6f5d1499b8dd':
|
2014-10-27 18:52:13 +00:00 |
|
Matthew Xie
|
631dd2ea58
|
am 231a8128: am 68f3653e: am 72c34e6a: Merge "Do not overwrite alias with device name" into lmp-dev
* commit '231a81282a9ac8fcfb4f42c5819181c78e3b133d':
|
2014-10-27 18:52:12 +00:00 |
|
PauloftheWest
|
0c32b376b8
|
am 58da4c37: am c932957d: am 0f01eeff: Merge "Removed an extraneous messge when pairing." into lmp-dev
* commit '58da4c37276ba1102a4a524b2a56c0b5db0e477f':
|
2014-10-27 18:52:11 +00:00 |
|
Sander Alewijnse
|
ef888ead0d
|
am 0fe16796: am c995e733: am 4241b0a9: Merge "Update targetSdkVersion check." into lmp-dev
* commit '0fe16796c55091ed7b75f75fdeed5b0e5b03da30':
|
2014-10-27 18:52:09 +00:00 |
|
Mark Salyzyn
|
54d56e6bb3
|
am 22955813: am 5f288bc1: am 894af268: logd: settings: ro.config.low_ram support
* commit '229558137318fdebce6b1bf3f5b30ea96e65a400':
|
2014-10-27 18:52:08 +00:00 |
|
Amith Yamasani
|
84af5ffd89
|
am 2f8b4173: am ae2da7a9: am 69b67465: Merge "Don\'t allow creating a guest from a secondary user..." into lmp-dev
* commit '2f8b4173581bb7a7421f6c49dee236cdebc66aaf':
|
2014-10-27 18:52:07 +00:00 |
|
John Spurlock
|
96cd925174
|
am ab4fe2d9: am 9e51261d: am ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev
* commit 'ab4fe2d94fc1a0f142a390ef25ca64bc83fa17a0':
|
2014-10-27 18:52:06 +00:00 |
|
PauloftheWest
|
4a62d8e69f
|
am 63f9500e: am 08183704: am 3cc81aea: Increase char limit for translation.
* commit '63f9500e0daae4b9aeda2bf4282bbe5dd8925b8e':
|
2014-10-27 18:52:05 +00:00 |
|
Maurice Lam
|
69ea67b60a
|
am 2ffb10d2: am fd4e0f25: am 27d74fa2: Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev
* commit '2ffb10d28bd1945004bd29390803a81ce5bf3338':
|
2014-10-27 18:52:04 +00:00 |
|
Baligh Uddin
|
70aabfde61
|
am fbb0218a: (-s ours) am 1741abb9: (-s ours) am 09a11d5b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit 'fbb0218a117df5537f6ef2835a673ef485e1cdb1':
|
2014-10-27 18:52:03 +00:00 |
|
PauloftheWest
|
a186ce831f
|
am d1cd913a: am 9007cf63: am ec21e62a: Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev
* commit 'd1cd913a6e1dc35da4d5e0c1fc4b48a0e382d486':
|
2014-10-27 18:52:02 +00:00 |
|
Edward Jee
|
6fc08883ce
|
am 000dd0a6: am a99ef887: am ac8b5b7f: Migrates PBAP and MAP access permission data from Settings to Bluetooth.
* commit '000dd0a6b24a8c383a2051201699bd2c93bc4159':
|
2014-10-27 18:52:00 +00:00 |
|
Edward Jee
|
cea371caf2
|
am 32c56ed4: am 50b6eec9: am b0954c1d: Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev
* commit '32c56ed434dbeec9cf2b0db62f43396d5b2a08d5':
|
2014-10-27 18:51:59 +00:00 |
|
PauloftheWest
|
20cb5d9101
|
am 8dee66d1: am 720af580: am 0ca0c8ad: Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev
* commit '8dee66d1248af1aa28b32d11b1b3160ab3a79437':
|
2014-10-27 18:51:58 +00:00 |
|
Dianne Hackborn
|
b453421f92
|
am 2acec676: am bf4ecab3: am 94aae9af: Little more on issue #17495264: tweak when we ignore initial times.
* commit '2acec6768fc67516eff484f6d4f8de607a597a60':
|
2014-10-27 18:51:57 +00:00 |
|
Dianne Hackborn
|
6a300d00aa
|
am ff966f2a: am 829b9975: am ecffbc91: Merge "Fix issue #17495264: Battery history graph is bad" into lmp-dev
* commit 'ff966f2a82044bed1d9d791be9aa0c30c8bb26cc':
|
2014-10-27 18:51:56 +00:00 |
|
Maurice Lam
|
6476e98139
|
am ea8db10a: am 0d09c6c1: am 795511ec: [WifiSetup] Disable app starting window
* commit 'ea8db10ac8fc3aafd7834c401aacf7245b244936':
|
2014-10-27 18:51:55 +00:00 |
|
PauloftheWest
|
c956628c74
|
am f1fc7219: am 24233660: am 13fbd848: Merge "Updated Wi-Fi Settings icons to new filled-in teal format." into lmp-dev
* commit 'f1fc7219298b5c8dd0bf5c695f3f3942289a05df':
|
2014-10-27 18:51:53 +00:00 |
|
Geoff Mendal
|
56e6248737
|
Import translations. DO NOT MERGE
automerge: f571e51 -s ours
* commit 'f571e511ba5ff6eb54c5d15de445a62614d5e00e':
Import translations. DO NOT MERGE
|
2014-10-27 18:33:48 +00:00 |
|
Geoff Mendal
|
1cb2797744
|
Import translations. DO NOT MERGE
Change-Id: Ic88453a3d2b7eb50fc739869dc84d3cbce836d6b
Auto-generated-cl: translation import
|
2014-10-27 10:03:05 -07:00 |
|
Geoff Mendal
|
f571e511ba
|
Import translations. DO NOT MERGE
Change-Id: Ia682e947ee01ba5ecc42b3a4578fcc010a7efead
Auto-generated-cl: translation import
|
2014-10-27 09:43:16 -07:00 |
|
Jim Miller
|
a3ff1a3fbe
|
am a30955a6: am 500ecf26: am dd932476: Merge "Minor cleanup in EncryptionInterstitial" into lmp-mr1-dev
* commit 'a30955a6634323dfc1ed2704ce0ca2f4f19d3ef3':
Minor cleanup in EncryptionInterstitial
|
2014-10-25 03:42:06 +00:00 |
|
Michael Wright
|
3f9b6331d6
|
am 56f8032a: am 7f402457: am ca6bc2ae: Skip Misc/Overcounted battery stats in release builds. automerge: f7a5017 automerge: 95f29a1
* commit '56f8032a0c826019ac5588dc2f059a4bf00a0455':
Skip Misc/Overcounted battery stats in release builds.
|
2014-10-25 02:36:55 +00:00 |
|
Sanket Padawe
|
a34e092c07
|
am 6215d8dd: Default sim name set to carrier name in sim settings automerge: 745046c automerge: 8d60883
* commit '6215d8dda9a94bb7dcacb483b3a26cdd39e299eb':
Default sim name set to carrier name in sim settings
|
2014-10-25 02:35:52 +00:00 |
|
Jim Miller
|
a30955a663
|
am 500ecf26: am dd932476: Merge "Minor cleanup in EncryptionInterstitial" into lmp-mr1-dev
* commit '500ecf26d15d75fa5baa8bc98ff61792fa858857':
Minor cleanup in EncryptionInterstitial
|
2014-10-25 01:20:33 +00:00 |
|
Jim Miller
|
500ecf26d1
|
am dd932476: Merge "Minor cleanup in EncryptionInterstitial" into lmp-mr1-dev
* commit 'dd932476b92f9d0e7ef8617d32a1d49d830b6787':
Minor cleanup in EncryptionInterstitial
|
2014-10-25 01:09:05 +00:00 |
|
Jim Miller
|
dd932476b9
|
Merge "Minor cleanup in EncryptionInterstitial" into lmp-mr1-dev
|
2014-10-25 01:01:17 +00:00 |
|