OSDN Git Service
Jeff Sharkey [Thu, 27 Aug 2015 20:21:16 +0000 (20:21 +0000)]
am
5a9e0e82: am
e56724ba: (-s ours) am
67f0739c: Merge "Block moving when already in progress." into mnc-dev
* commit '
5a9e0e8236dcab5e086d95c45e9b0e4ca30da88d':
Billy Lau [Thu, 27 Aug 2015 20:21:14 +0000 (20:21 +0000)]
am
a75c60d7: am
2cbb3c86: (-s ours) am
a59f39fc: Merge "Bug:
21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
* commit '
a75c60d7ddd6612bf7bc4cf87d12156be72ac50f':
Dianne Hackborn [Thu, 27 Aug 2015 20:21:12 +0000 (20:21 +0000)]
am
528a2548: am
e426005b: (-s ours) am
e7a5966a: Merge "Fix issue #
23037720: New Battery Optimization Strings" into mnc-dev
* commit '
528a2548b824867572984be40b26c02902504e83':
Julia Reynolds [Thu, 27 Aug 2015 20:21:10 +0000 (20:21 +0000)]
am
2af5aa09: am
a9490b68: (-s ours) am
5ab0e183: Merge "Hide optimization control on battery details page for non whitelisted apps." into mnc-dev
* commit '
2af5aa09a0e8506c64a544dc74475b5ce5aaed1d':
Geoff Mendal [Thu, 27 Aug 2015 20:21:08 +0000 (20:21 +0000)]
am
ab74a871: (-s ours) am
acf198a7: (-s ours) am
2d546b77: (-s ours) Import translations. DO NOT MERGE
* commit '
ab74a871817767ac861fc7ae30ebb16f406f3109':
Andres Morales [Thu, 27 Aug 2015 20:21:06 +0000 (20:21 +0000)]
am
dcaf07d0: am
af2ea2f4: (-s ours) am
4897fa87: Merge "fix CC for work profiles" into mnc-dev
* commit '
dcaf07d0bb6cf031cab7ab04fa927421fbf7311e':
Geoff Mendal [Thu, 27 Aug 2015 20:21:03 +0000 (20:21 +0000)]
am
14457a0a: (-s ours) am
9acc740e: (-s ours) am
7930f872: (-s ours) Import translations. DO NOT MERGE
* commit '
14457a0aec66e5c712c38d8f81c3bbac9c5ea87b':
Jason Monk [Thu, 27 Aug 2015 20:20:56 +0000 (20:20 +0000)]
am
81a08e38: am
aceedc73: (-s ours) am
888673bd: Hide show/hide system from battery optimizations list
* commit '
81a08e382ac09c07b353a1c5ce515f26c9064354':
Sanket Padawe [Thu, 27 Aug 2015 20:20:54 +0000 (20:20 +0000)]
am
cac8f172: am
086dde01: (-s ours) am
151612fb: am
5f9d15ed: am
86d85300: am
19336da3: am
ac2347c0: am
158fa952: am
df9b13af: am
74d85949: am
e05f7143: Check for special char when renaming device for Wi-Fi direct.
* commit '
cac8f172102289a608f2b894d3402cf231f424d0':
Ajay Panicker [Thu, 27 Aug 2015 20:20:51 +0000 (20:20 +0000)]
am
5fca7d06: am
8c0139b1: (-s ours) am
cd8acb22: Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev
* commit '
5fca7d06fea5c890c224d40319eb7e4b4fa56986':
Jason Monk [Thu, 27 Aug 2015 20:20:49 +0000 (20:20 +0000)]
am
7d474282: am
12c70b7c: (-s ours) am
244fd782: Merge "Remove summaries fro configure apps page" into mnc-dev
* commit '
7d474282be18ada378517478fecd6631d459814b':
Maurice Lam [Thu, 27 Aug 2015 20:20:47 +0000 (20:20 +0000)]
am
6f9b92f8: am
a2f78eaf: (-s ours) am
311a2d95: Merge "[Fingerprint] Update string for enrolling" into mnc-dev
* commit '
6f9b92f83bd5f32f8b588698f53de5737a1e08b3':
Maurice Lam [Thu, 27 Aug 2015 20:20:45 +0000 (20:20 +0000)]
am
2d5c9de6: am
6863fac2: (-s ours) am
8c9136ef: Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev
* commit '
2d5c9de6b54cbc6e63071dbac874cec32e989340':
Nick Kralevich [Thu, 27 Aug 2015 20:20:43 +0000 (20:20 +0000)]
am
35e08b44: am
8a85dcc9: (-s ours) am
1adca55f: Merge "UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER" into mnc-dev
* commit '
35e08b441c308110b91df03cb2d456f05a2bdfa4':
Jason Monk [Thu, 27 Aug 2015 20:20:41 +0000 (20:20 +0000)]
am
d50c024c: am
25adfb00: (-s ours) am
f61ead7a: Make sure accessibility service desc isn\'t clickable
* commit '
d50c024c109f86be5dcb637c336acdf99b2cfa2d':
Dianne Hackborn [Thu, 27 Aug 2015 20:20:36 +0000 (20:20 +0000)]
am
e885c27c: am
50cb6411: (-s ours) am
f426126a: Merge "Fix issue #
22860466: viapi security bug - rubber stamping in nested VIs" into mnc-dev
* commit '
e885c27c08acb3a01388d597ffda9c15ce49c9a2':
Chris Tate [Thu, 27 Aug 2015 20:20:29 +0000 (20:20 +0000)]
am
8c2593e0: am
5977cfdf: (-s ours) am
6e64e22e: Merge "Explain properly when apps can open multiple hosts\' links" into mnc-dev
* commit '
8c2593e0da66de2996630438d97d40d6104036ad':
Prem Kumar [Thu, 27 Aug 2015 20:20:26 +0000 (20:20 +0000)]
am
dc30961b: am
0694de93: (-s ours) am
eed361bb: Merge "Allow Contact sharing by default while connecting Car Kit." into mnc-dev
* commit '
dc30961b4354c9fa24bc810f10b4136068c56335':
Maurice Lam [Thu, 27 Aug 2015 20:20:24 +0000 (20:20 +0000)]
am
98d6d7c9: am
01495108: (-s ours) am
87fadbe6: [Fingerprint] Help text for backup screen lock
* commit '
98d6d7c9d4ec59c78fa3106d65e0805d54f8fde8':
Geoff Mendal [Thu, 27 Aug 2015 20:20:22 +0000 (20:20 +0000)]
am
ad6eb955: (-s ours) am
a5af1375: (-s ours) am
c493f042: (-s ours) Import translations. DO NOT MERGE
* commit '
ad6eb955e4f7f2cc7950e8f8cc0446fa6fc1060e':
Vinit Deshpande [Thu, 27 Aug 2015 20:20:19 +0000 (20:20 +0000)]
am
ac23c640: am
96ae93e4: (-s ours) am
b74c0b2a: Merge "wifi: Check for the sizeof ssid to start SoftAP" into mnc-dev
* commit '
ac23c640b53d6353504946e76b9a004c456e0b5c':
Jim Miller [Thu, 27 Aug 2015 20:20:17 +0000 (20:20 +0000)]
am
6b120f32: am
fe87f19b: (-s ours) am
efaa19d9: Fix fingerprint enrolling bug.
* commit '
6b120f324e19bbea4b855050c8c5f3948e913af0':
Maurice Lam [Thu, 27 Aug 2015 20:20:15 +0000 (20:20 +0000)]
am
d9e42d64: am
e1548aba: (-s ours) am
88832a3d: Merge "[Fingerprint] Disable back in setup enrolling screen" into mnc-dev
* commit '
d9e42d64ea649f94a2fd756aaef7417b2f9bcca4':
Geoff Mendal [Thu, 27 Aug 2015 20:20:13 +0000 (20:20 +0000)]
am
78ed71c6: (-s ours) am
b02410c4: (-s ours) am
13cbe053: (-s ours) Import translations. DO NOT MERGE
* commit '
78ed71c68a246d34154a03b7e5661e73dbd97e26':
Jeff Sharkey [Thu, 27 Aug 2015 20:20:11 +0000 (20:20 +0000)]
am
10957201: am
bf49bdf9: (-s ours) am
c7e59e52: Merge "Let Settings measure transient free space." into mnc-dev
* commit '
109572010bb3875bf4b8155743c4f00716f2cdf2':
Maurice Lam [Thu, 27 Aug 2015 20:20:09 +0000 (20:20 +0000)]
am
605396b5: am
0074510a: (-s ours) am
997bcaa7: Merge "[Fingerprint] Advertise wake & unlock during SUW" into mnc-dev
* commit '
605396b5429ffe6c491cb3649c95e661f02d1f52':
Geoff Mendal [Thu, 27 Aug 2015 20:20:07 +0000 (20:20 +0000)]
am
02b262d4: (-s ours) am
197cfdbd: (-s ours) am
6b0a2d21: (-s ours) Import translations. DO NOT MERGE
* commit '
02b262d4bc1c599f32eec0d63aa60f46a24efe74':
Fyodor Kupolov [Thu, 27 Aug 2015 20:20:05 +0000 (20:20 +0000)]
am
bf68f8d4: am
b3fd5e17: (-s ours) am
c3067882: Merge "Added android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev
* commit '
bf68f8d4c89e38667c607ecadd1cc36a0b6362ce':
Jorim Jaggi [Thu, 27 Aug 2015 20:20:02 +0000 (20:20 +0000)]
am
3ee1bc7d: am
93eff27e: (-s ours) am
92f9bdc6: Merge "Add dialog to confirm last fingerprint removal" into mnc-dev
* commit '
3ee1bc7d2193b1bbbfcca84669032e7a71d88504':
Jeff Sharkey [Thu, 27 Aug 2015 20:20:00 +0000 (20:20 +0000)]
am
d4dc3e3b: am
43c41edf: (-s ours) am
bb9d6b90: Merge "Refresh after clearing, tweak warn threshold." into mnc-dev
* commit '
d4dc3e3b1e4a1a728de5d6d0914066c921d96695':
Billy Lau [Thu, 27 Aug 2015 20:19:56 +0000 (20:19 +0000)]
am
aaa1621b: am
62d04c00: (-s ours) am
eb372c93: Merge "Bug:
22718745 Intents to \'draw over other apps\' should go direct to the package\'s page instead of the top level one" into mnc-dev
* commit '
aaa1621b6bb3ef212465fb9770ba9998f39554b0':
Jason Monk [Thu, 27 Aug 2015 20:19:54 +0000 (20:19 +0000)]
am
6e27d595: am
2ff120a3: (-s ours) am
19128bd1: Extend char limit by small amount
* commit '
6e27d59553400aca605993588d78e60ee5968221':
Geoff Mendal [Thu, 27 Aug 2015 20:19:52 +0000 (20:19 +0000)]
am
c60a5923: (-s ours) am
149ceebc: (-s ours) am
597d75ea: (-s ours) Import translations. DO NOT MERGE
* commit '
c60a59235d0805e2f18c15956c3520f587a29e32':
Geoff Mendal [Thu, 27 Aug 2015 20:19:49 +0000 (20:19 +0000)]
am
4475b771: (-s ours) am
e6f7a8bf: (-s ours) am
53f771d8: (-s ours) Import translations. DO NOT MERGE
* commit '
4475b7712f75e1d6d1adf6064b35f7818c66081a':
Jorim Jaggi [Thu, 27 Aug 2015 20:19:48 +0000 (20:19 +0000)]
am
8f212848: am
7b48a1c6: (-s ours) am
23ace013: Merge "Adjustments for find sensor screen" into mnc-dev
* commit '
8f21284807ea33980c4f3ef361ab240a097c9b63':
Fyodor Kupolov [Thu, 27 Aug 2015 20:19:46 +0000 (20:19 +0000)]
am
c4f1eaaf: am
2c5f5921: (-s ours) am
2731a18f: Merge "brightness status not refresh in powercontrol widget"
* commit '
c4f1eaaf0373ab343e58ed8f73b2777255bbb9d0':
Maurice Lam [Thu, 27 Aug 2015 20:19:44 +0000 (20:19 +0000)]
am
aa69ebb5: am
862343bc: (-s ours) am
3760e5e7: Merge "[ZenMode] Align text to viewStart in remove dialog" into mnc-dev
* commit '
aa69ebb566623a97cf263d1024a5710179522ba4':
Julia Reynolds [Thu, 27 Aug 2015 20:19:42 +0000 (20:19 +0000)]
am
1d85676b: am
4254518a: (-s ours) am
00b5488c: Merge "Change assist app warning message text" into mnc-dev
* commit '
1d85676b5740b941077ccbf3ea6ec8329d72a77c':
Julia Reynolds [Thu, 27 Aug 2015 20:19:40 +0000 (20:19 +0000)]
am
1281463f: am
06e59246: (-s ours) am
ae422fd0: Merge "Change \'data\' label to \'data usage\'." into mnc-dev
* commit '
1281463f6d55982cf82038c7d43b1862633ab35c':
Chris Wren [Thu, 27 Aug 2015 20:19:38 +0000 (20:19 +0000)]
am
54aedb67: am
3605c435: (-s ours) am
2a56d7f2: Merge "fix InactiveApps instrumentation" into mnc-dev
* commit '
54aedb67fdf8359603b75df903b8e0eb6c002300':
Martijn Coenen [Thu, 27 Aug 2015 20:19:36 +0000 (20:19 +0000)]
am
68da3bcb: am
3e7d3faf: (-s ours) am
edb2668c: Merge "Add contactless symbol to NFC resources." into mnc-dev
* commit '
68da3bcbd5641d6078e9a37f36690d33bd5c4455':
Julia Reynolds [Thu, 27 Aug 2015 20:19:33 +0000 (20:19 +0000)]
am
d16f564d: am
0a52b7b3: (-s ours) am
300d6fd9: Merge "Use pattern visibility setting on confirm pattern screen." into mnc-dev
* commit '
d16f564d0b2b621e107ac896f041dbf23c149126':
Julia Reynolds [Thu, 27 Aug 2015 20:19:31 +0000 (20:19 +0000)]
am
468bf839: am
72bb3a69: (-s ours) am
f889faaf: Merge "Bump string char limit." into mnc-dev
* commit '
468bf8393ba8ccb007c7a144afcce7f8c157eade':
Martijn Coenen [Thu, 27 Aug 2015 20:19:29 +0000 (20:19 +0000)]
am
67d37ec8: am
274d9246: (-s ours) am
8e7b9cf9: Merge "Fix tap & pay strings." into mnc-dev
* commit '
67d37ec89307d959894f0e1065a8334cf72b9f0a':
Zach Johnson [Thu, 27 Aug 2015 20:19:26 +0000 (20:19 +0000)]
am
965dd0f3: am
4fd8d1e1: (-s ours) am
a425e864: Merge "Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED" into mnc-dev
* commit '
965dd0f3b4df454a4356a6a84d7c5a0f5179f556':
Julia Reynolds [Thu, 27 Aug 2015 20:19:24 +0000 (20:19 +0000)]
am
aa139449: am
1ae73faf: (-s ours) am
5b5ed310: Merge "Prevent crash in app memory updater." into mnc-dev
* commit '
aa13944984e77d4ccab8f21e48512ad3de32cb48':
Julia Reynolds [Thu, 27 Aug 2015 20:19:23 +0000 (20:19 +0000)]
am
3ae4f044: am
b5063920: (-s ours) am
feeae4cd: Merge "Hide usage graph on app usage details pages." into mnc-dev
* commit '
3ae4f044889f2b773ac96010791a0cd79b926702':
Jorim Jaggi [Thu, 27 Aug 2015 20:19:20 +0000 (20:19 +0000)]
am
0a3fa3d9: am
9fd7d6fd: (-s ours) am
5458688c: Merge "Make fingerprint error text a live region" into mnc-dev
* commit '
0a3fa3d9a37ed309789f7efb88b52dca08e87ec6':
Jorim Jaggi [Thu, 27 Aug 2015 20:19:18 +0000 (20:19 +0000)]
am
111e82df: am
4088cef8: (-s ours) am
74af384c: Merge "Adjust enrollment UI for sw400 devices" into mnc-dev
* commit '
111e82dfce39f1a6fc9cdd18e27bcb4e219341b6':
Jorim Jaggi [Thu, 27 Aug 2015 20:19:16 +0000 (20:19 +0000)]
am
4fdd5cc6: am
a77130f7: (-s ours) am
4d9f5c91: Merge "Don\'t use screenshot if structure is disabled (2/2)" into mnc-dev
* commit '
4fdd5cc6e0814a2ee06ce28bf9f1d1c613d142be':
Jorim Jaggi [Thu, 27 Aug 2015 20:19:14 +0000 (20:19 +0000)]
am
3ae8ae37: am
69941efa: (-s ours) am
730389bd: Merge "Adjust choose assist app string" into mnc-dev
* commit '
3ae8ae371f0361927753153540aa0b3232cafb18':
Jorim Jaggi [Thu, 27 Aug 2015 20:19:12 +0000 (20:19 +0000)]
am
2531fe7c: am
e4e8bb34: (-s ours) am
dcf61a2d: Merge "Fix blank confirm device credential activity" into mnc-dev
* commit '
2531fe7c4501a5c44534850e2670dfe1e77cb3f3':
Selim Cinek [Thu, 27 Aug 2015 20:19:09 +0000 (20:19 +0000)]
am
da7bbe68: am
d2b6e1ac: (-s ours) am
596ce9ba: Merge "Autocapitalizing the fingerprint names now" into mnc-dev
* commit '
da7bbe68101413a44f0cf985b22e92ab280b2d26':
Selim Cinek [Thu, 27 Aug 2015 20:19:07 +0000 (20:19 +0000)]
am
5aae3cae: am
412eb5df: (-s ours) am
a8c7c8c8: Merge "Added content description for the fingerprint icon" into mnc-dev
* commit '
5aae3caea2b0bac5e6e03f8b5fe38914d1b05ec2':
Selim Cinek [Thu, 27 Aug 2015 20:19:05 +0000 (20:19 +0000)]
am
73de309d: am
e0f552c1: (-s ours) am
95ddf903: Merge "Adapted a string in the fingerprint enrollment flow" into mnc-dev
* commit '
73de309dc9d737cb6461b4980cabacbec3b02c2c':
Jorim Jaggi [Thu, 27 Aug 2015 20:19:02 +0000 (20:19 +0000)]
am
ff53e141: am
607e7963: (-s ours) am
58d1995c: Merge "Move PIN/Pattern appear animation to RenderThread (2/2)" into mnc-dev
* commit '
ff53e1415a45c36f2328daa2c089691098acbb82':
Jason Monk [Thu, 27 Aug 2015 20:19:00 +0000 (20:19 +0000)]
am
5c87cdd8: am
9a5dc80d: (-s ours) am
3b521b60: Merge "Battery summary - tint uid 0 icon" into mnc-dev
* commit '
5c87cdd8a7970500921b263103867a46cd7ccff9':
Jason Monk [Thu, 27 Aug 2015 20:18:57 +0000 (20:18 +0000)]
am
c3c9dbd3: am
9d5907d0: (-s ours) am
08cb3983: Merge "Update battery optimization strings" into mnc-dev
* commit '
c3c9dbd31eb421096913f8794e95e8d039d6dc5e':
Sanket Padawe [Thu, 27 Aug 2015 20:18:55 +0000 (20:18 +0000)]
am
759e3fab: am
9cbb3549: (-s ours) am
ca258251: Merge "Fix issues in AP dialog arising after clicking on AP preferences." into mnc-dev
* commit '
759e3fab0b8ec479845a217aede3b683ef785f97':
Julia Reynolds [Thu, 27 Aug 2015 20:18:52 +0000 (20:18 +0000)]
am
ff5823f5: am
0b674961: (-s ours) am
9a1c0dce: Handle app uninstall via Storage & USB.
* commit '
ff5823f58ae938155bdb7338bbbddc6ef0419bed':
Geoff Mendal [Thu, 27 Aug 2015 20:18:46 +0000 (20:18 +0000)]
am
b1c078f4: (-s ours) am
a8b7c118: (-s ours) am
e37e1232: (-s ours) Import translations. DO NOT MERGE
* commit '
b1c078f479a8c97eff6dde9306742cb4b76b959d':
Adrian Roos [Thu, 27 Aug 2015 20:18:41 +0000 (20:18 +0000)]
am
c667011f: am
d6dc0bb4: (-s ours) am
38c9b9eb: Update FRP warning to spec
* commit '
c667011fad3eb0ff62e495ced2d861679c1a8c80':
Maurice Lam [Thu, 27 Aug 2015 20:18:38 +0000 (20:18 +0000)]
am
d04a354f: am
27165dc3: (-s ours) am
36c76014: Merge "[Fingerprint] Show skip button during SUW" into mnc-dev
* commit '
d04a354f3ee98fd133b96fd083846a5ab5f9419f':
Geoff Mendal [Thu, 27 Aug 2015 20:18:35 +0000 (20:18 +0000)]
am
1bc1ba75: (-s ours) am
61c436d7: (-s ours) am
5376d54e: (-s ours) Import translations. DO NOT MERGE
* commit '
1bc1ba7591664f2ab42c149fd2534b0be392fc7b':
Svetoslav Ganov [Thu, 27 Aug 2015 20:18:32 +0000 (20:18 +0000)]
am
a431dacb: am
6356ee4b: (-s ours) am
cce844a7: Merge "Reset permissions and app links when clearing app preferences - settings" into mnc-dev
* commit '
a431dacb60edf4fa77b348a3145c091bc236ec91':
Jason Monk [Thu, 27 Aug 2015 20:18:29 +0000 (20:18 +0000)]
am
3e63b62e: am
06621a57: (-s ours) am
8bf5f307: Merge "Fix battery detail issues with "Android OS"" into mnc-dev
* commit '
3e63b62e802d0d40e24ac24de62c92d5fb7ef5a8':
Jason Monk [Thu, 27 Aug 2015 20:18:22 +0000 (20:18 +0000)]
am
4e3a98cc: am
5b3921e4: (-s ours) am
9927acd3: Merge "Don\'t show disabled apps in ignore optimizations" into mnc-dev
* commit '
4e3a98ccf11f666aeb8e49ef7adb20d54ed5e18e':
Guang Zhu [Thu, 27 Aug 2015 20:18:17 +0000 (20:18 +0000)]
am
65fc6ae9: am
8a4dda67: (-s ours) am
c1bef743: Prevent monkey from changing adoptable storage settings
* commit '
65fc6ae97be6cd560353e397e271d722a1c4d85d':
Pavel Zhamaitsiak [Thu, 27 Aug 2015 20:18:14 +0000 (20:18 +0000)]
am
f07fb805: am
8a222530: (-s ours) am
d9e0ed1b: Merge "Add or remove WFC setting when Wireless settings activity is resumed" into mnc-dev
* commit '
f07fb8054457aa7a3d410e63fb8435044a7aa757':
Jason Monk [Thu, 27 Aug 2015 20:18:11 +0000 (20:18 +0000)]
am
03dcebb6: am
e2840f1c: (-s ours) am
838c8432: Merge "Remove tuner from development settings" into mnc-dev
* commit '
03dcebb641083d8e02d0019acee9bebd0678a2ea':
Maurice Lam [Thu, 27 Aug 2015 20:18:09 +0000 (20:18 +0000)]
am
00c4204d: am
2f2779ac: (-s ours) am
32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev
* commit '
00c4204d1d7d7982c93041b14abe407540d9c699':
Maurice Lam [Thu, 27 Aug 2015 20:18:06 +0000 (20:18 +0000)]
am
96235b33: am
9dd92338: (-s ours) am
3c1f46dc: Merge "[Fingerprint] Send RESULT_CANCELED when back from Add another" into mnc-dev
* commit '
96235b3345c47b853108dca5a1f7841ee0060d57':
Maurice Lam [Thu, 27 Aug 2015 20:18:04 +0000 (20:18 +0000)]
am
3d09fef6: am
899d0a28: (-s ours) am
e44ceed1: Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev
* commit '
3d09fef6f3484d90803af5ad60b586a9d13dccf0':
Billy Lau [Thu, 27 Aug 2015 20:18:01 +0000 (20:18 +0000)]
am
bc23f8e8: am
3d861fd1: (-s ours) am
d06ba151: Merge "Bug
21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev
* commit '
bc23f8e87fc8b698cfdd20ef17fafa17f674e4a8':
Amit Mahajan [Thu, 27 Aug 2015 20:17:59 +0000 (20:17 +0000)]
am
eb22a7e5: am
c1d2289b: (-s ours) am
e8357caa: Merge "Fix bug to force to close once change Bearer on APN" into mnc-dev
* commit '
eb22a7e5e801c697836136c6ba1b8568a2afa8aa':
Julia Reynolds [Thu, 27 Aug 2015 20:17:56 +0000 (20:17 +0000)]
am
6f90c1e5: am
cb271219: (-s ours) am
f516e7dd: Make \'fingerprint\' searchable in Settings.
* commit '
6f90c1e52c5b996566391ee387fc582b9c115f9b':
Maurice Lam [Thu, 27 Aug 2015 20:17:53 +0000 (20:17 +0000)]
am
be127765: am
c97e5aba: (-s ours) am
d85fafce: Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev
* commit '
be1277653320931d3c30f266a805e0b7bad8d53a':
Maurice Lam [Thu, 27 Aug 2015 20:17:50 +0000 (20:17 +0000)]
am
63cccf0e: am
a33b68af: (-s ours) am
d10026cb: Merge "[Fingerprint] Change message in encryption" into mnc-dev
* commit '
63cccf0ee900cef3c8046cbc1002e29977d370d8':
Maurice Lam [Thu, 27 Aug 2015 20:17:48 +0000 (20:17 +0000)]
am
34b0d29c: am
ac4b7fac: (-s ours) am
af57ec88: Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev
* commit '
34b0d29c728d966a51fa173d1e16ccda5465f44b':
Jim Miller [Thu, 27 Aug 2015 20:17:44 +0000 (20:17 +0000)]
am
ad967163: am
d55152af: (-s ours) am
3977df03: Merge "Don\'t launch ConfirmDeviceCredentials multiple times." into mnc-dev
* commit '
ad9671633a5e23a85405056786967130cb4942e6':
Geoff Mendal [Thu, 27 Aug 2015 20:17:41 +0000 (20:17 +0000)]
am
817e6042: (-s ours) am
bc8c7914: (-s ours) am
1992d5a1: (-s ours) Import translations. DO NOT MERGE
* commit '
817e60422ae3c1fe9f2ba4cea0252d2975711ba5':
Makoto Onuki [Thu, 27 Aug 2015 20:17:38 +0000 (20:17 +0000)]
am
eeb54564: am
9e95d6ce: (-s ours) am
4dd637a0: Merge "Fix ugly text wrapping on non-english locales" into mnc-dev
* commit '
eeb54564015b6bfe20adb06e04b5b8382fd10cc5':
Jason Monk [Thu, 27 Aug 2015 20:17:35 +0000 (20:17 +0000)]
am
fab32abd: am
cb4b45cc: (-s ours) am
178c4099: Merge "Handle monkey crash" into mnc-dev
* commit '
fab32abd36833c30c3af4277c49340b9d728f725':
Christopher Tate [Thu, 27 Aug 2015 20:17:33 +0000 (20:17 +0000)]
am
6e9ace6a: am
55073e09: (-s ours) am
b852fcbd: Merge "Offer \'ask\' as an available app-linking state" into mnc-dev
* commit '
6e9ace6a5aa0d03dd1629a1069a3e14a2ddef7bc':
Jim Miller [Thu, 27 Aug 2015 20:17:30 +0000 (20:17 +0000)]
am
2c8ee8e6: am
7120c7b6: (-s ours) am
bf9a425d: Merge "Simplify FingerprintSettings" into mnc-dev
* commit '
2c8ee8e6e68fca38188379126cbb40c1aa8d5185':
Julia Reynolds [Thu, 27 Aug 2015 20:17:28 +0000 (20:17 +0000)]
am
18611616: am
75b901c3: (-s ours) am
0c03b50a: Merge "Remove blank switchtext from switch preferences." into mnc-dev
* commit '
186116163ee8b6ed2197cfd0f6e734957da89046':
Billy Lau [Thu, 27 Aug 2015 20:17:25 +0000 (20:17 +0000)]
am
e058a53f: am
262b64e7: (-s ours) am
90a8a01b: Merge "Bug
21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)..." into mnc-dev
* commit '
e058a53fd2367f080b52fe56c80af3267ce4781b':
Christopher Tate [Thu, 27 Aug 2015 20:17:22 +0000 (20:17 +0000)]
am
0cc7388b: am
feb343ad: (-s ours) am
ddaa142a: Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
* commit '
0cc7388b20bd31fb4f63479c1d505807adf42833':
Kenny Guy [Thu, 27 Aug 2015 20:17:19 +0000 (20:17 +0000)]
am
c8f366e8: am
e200c475: (-s ours) am
705faddb: Merge "Show disabled trust agents as off." into mnc-dev
* commit '
c8f366e843dba00465f2863fa3de42a986d65704':
Sanket Padawe [Thu, 27 Aug 2015 20:17:17 +0000 (20:17 +0000)]
am
0d3accb7: am
bee718b7: (-s ours) am
046decca: Merge "Use common xml file for multi-tab settings." into mnc-dev
* commit '
0d3accb711bbfd8c31f9bbc228b0b3441fbd39ff':
Maurice Lam [Thu, 27 Aug 2015 20:17:14 +0000 (20:17 +0000)]
am
9541f8c3: am
d4fa7aa4: (-s ours) am
bec1d295: Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev
* commit '
9541f8c35e01360d29be2e7095e03d60ae116b92':
Jason Monk [Thu, 27 Aug 2015 20:17:12 +0000 (20:17 +0000)]
am
c4865d16: am
94b75858: (-s ours) am
50972605: Merge "Disable ignore battery optimization items that can\'t change" into mnc-dev
* commit '
c4865d16e9e0b55df2a071f0f106f82ce012ce31':
Jason Monk [Thu, 27 Aug 2015 20:17:09 +0000 (20:17 +0000)]
am
31cb2f6c: am
5fa374cc: (-s ours) am
4a6b9095: Merge "Change move storage from dropdown pref to dialog" into mnc-dev
* commit '
31cb2f6c01cd414463c2a1c0ca0d28d78af86e0d':
Maurice Lam [Thu, 27 Aug 2015 20:17:06 +0000 (20:17 +0000)]
am
05faf840: am
58a6af14: (-s ours) am
4595978b: Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-dev
* commit '
05faf8408a79f019d2ce7aa01f90f1dcf07f0fc5':
Jim Miller [Thu, 27 Aug 2015 20:17:03 +0000 (20:17 +0000)]
am
c7c1dbc6: am
2a414b93: (-s ours) am
6b9d7889: Merge "Fixed the layout for the fingerprint renaming" into mnc-dev
* commit '
c7c1dbc6388bcb921b3404b8f664eac90df91c29':
Maurice Lam [Thu, 27 Aug 2015 20:17:01 +0000 (20:17 +0000)]
am
11eb2c1c: am
d7be0656: (-s ours) am
f90628c6: Merge "[Fingerprint] Export FingerprintEnrollIntroduction" into mnc-dev
* commit '
11eb2c1caf012564569139148f5cb008b8118a39':
Jason Monk [Thu, 27 Aug 2015 20:16:58 +0000 (20:16 +0000)]
am
91de89d3: am
4a381902: (-s ours) am
cd075edf: Merge "Fix Help menu for PrivateVolumeSettings" into mnc-dev
* commit '
91de89d3b72562884779a3488b36fe00951132c4':
Geoff Mendal [Thu, 27 Aug 2015 20:16:56 +0000 (20:16 +0000)]
am
054e904a: (-s ours) am
e1875783: (-s ours) am
f3907176: (-s ours) Import translations. DO NOT MERGE
* commit '
054e904ad1b0260bad91d656ad28fff11c96980f':
Narayan Kamath [Thu, 27 Aug 2015 20:16:53 +0000 (20:16 +0000)]
am
38de1548: am
45e1e1ec: (-s ours) am
83a25842: Merge "Lose some deprecated test annotations."
* commit '
38de1548c9c43a9777bcfd50cc552753f98aa87c':
xinhe [Thu, 27 Aug 2015 20:16:51 +0000 (20:16 +0000)]
am
8b126014: am
e9c822b0: (-s ours) am
d7fb46de: Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev
* commit '
8b126014ac7e0eefd9e7f62dfd1ac0528772e23e':
OSDN Git Service
