OSDN Git Service
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':
Jim Miller [Thu, 27 Aug 2015 20:16:48 +0000 (20:16 +0000)]
am
dada503b: am
52374856: (-s ours) am
e641e7d7: Merge "Postpone call to postEnroll() until we actually leave activity." into mnc-dev
* commit '
dada503b703ea3f921f199f51715b285643d8b8e':
Jason Monk [Thu, 27 Aug 2015 20:16:46 +0000 (20:16 +0000)]
am
5fc2b6b9: am
81044820: (-s ours) am
acc70a3a: Merge "Add content description to wifi networks" into mnc-dev
* commit '
5fc2b6b9a88c3099ebdb139a89c1ca812ddd4a5f':
Billy Lau [Thu, 27 Aug 2015 20:16:43 +0000 (20:16 +0000)]
am
b9f81687: am
45b27c3a: (-s ours) am
52df60d8: Merge "Bug:
21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps." into mnc-dev
* commit '
b9f816874a1b2e4a55d82e0129ebd273c620c6f9':
Jorim Jaggi [Thu, 27 Aug 2015 20:16:41 +0000 (20:16 +0000)]
am
25e49323: am
8f37d4bc: (-s ours) am
8505d4a5: Merge "Disable voice input if assist is voice service" into mnc-dev
* commit '
25e493239ea5b1dec98df8f987695a7fa299df79':
Jason Monk [Thu, 27 Aug 2015 20:16:38 +0000 (20:16 +0000)]
am
b0c6d9f0: am
31e05386: (-s ours) am
7713fe26: Merge "Disable notification volume when user restricted" into mnc-dev
* commit '
b0c6d9f0a3c27c8975eda3270187970dc602b537':
Martijn Coenen [Thu, 27 Aug 2015 20:16:35 +0000 (20:16 +0000)]
am
bb9cb3bb: am
90d21f09: (-s ours) am
8d9bb1ae: Merge "Fix up Tap and Pay how it works." into mnc-dev
* commit '
bb9cb3bb087c24d897f21a179a78f5e9b838e08e':
Jason Monk [Thu, 27 Aug 2015 20:16:32 +0000 (20:16 +0000)]
am
b9b4ea93: am
34e7b4cd: (-s ours) am
53dd1d4d: Merge "Fix app icon size" into mnc-dev
* commit '
b9b4ea9383b856aa9700d47aabcfddf1534db81e':
Sanket Padawe [Thu, 27 Aug 2015 20:16:30 +0000 (20:16 +0000)]
am
14cb5c9e: am
c319bac5: (-s ours) am
7995ca41: Use same technology type for LTE/4G
* commit '
14cb5c9ee2d999aa4f07a555e64768678ab073b7':
Chris Wren [Thu, 27 Aug 2015 20:16:27 +0000 (20:16 +0000)]
am
1271a4ab: am
ae15849d: (-s ours) am
2f8bb8ea: Merge "import new view enums into MetricsLogger" into mnc-dev
* commit '
1271a4abdde9b120a653f0e9006098f71fbd2a61':
Geoff Mendal [Thu, 27 Aug 2015 20:16:24 +0000 (20:16 +0000)]
am
226b8d30: (-s ours) am
329cea48: (-s ours) am
536ed184: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
226b8d30d09a2626fc379ff0c7411786a191b4ed':
Zoltan Szatmary-Ban [Thu, 27 Aug 2015 20:16:20 +0000 (20:16 +0000)]
am
fde01451: am
30a73372: (-s ours) am
098c296d: Merge "Do not throw exception when MeasurementDetails.mediaSize is empty" into mnc-dev
* commit '
fde014516f884e957a1fdcd0a4c8d8ff71c0f47c':
Geoff Mendal [Thu, 27 Aug 2015 20:16:18 +0000 (20:16 +0000)]
am
458a9bfd: (-s ours) am
88afe4a4: (-s ours) am
da15ade8: (-s ours) Import translations. DO NOT MERGE
* commit '
458a9bfd40dc895ea624e0539e0d75f1080abcd6':
Robin Lee [Thu, 27 Aug 2015 20:16:14 +0000 (20:16 +0000)]
am
248f0d64: am
27c45eb9: (-s ours) am
7ba46433: Merge "Match getLegacyVpn calls to changed interface" into mnc-dev
* commit '
248f0d640c2d683f456235515544907af0a9f02c':
Rubin Xu [Thu, 27 Aug 2015 20:16:08 +0000 (20:16 +0000)]
am
dc87b105: am
20eb7e10: (-s ours) am
331b9823: Merge "Remove unused MediaFormat activity" into mnc-dev
* commit '
dc87b1052370a4c1966dbc70856869359df37e03':
Jason Monk [Thu, 27 Aug 2015 20:16:04 +0000 (20:16 +0000)]
am
9f42b595: am
4484cc4f: (-s ours) am
7ab3cf94: Merge "Fix wifi not re-ordering" into mnc-dev
* commit '
9f42b59567d7e62fdab7cf40a9136d9a2b8b3453':
Julia Reynolds [Thu, 27 Aug 2015 20:16:01 +0000 (20:16 +0000)]
am
60717d23: am
bc79da2b: (-s ours) am
ddd887af: Prevent crash when removing an account.
* commit '
60717d23ec4d5c3fab71270532c7a6e415b71665':
Julia Reynolds [Thu, 27 Aug 2015 20:15:57 +0000 (20:15 +0000)]
am
aa4abafb: am
46ea05da: (-s ours) am
963e3fdd: Merge "Talkback improvements for Settings screens." into mnc-dev
* commit '
aa4abafbc2e091e4c204131ada1f8b9766df96e0':
Jason Monk [Thu, 27 Aug 2015 20:15:53 +0000 (20:15 +0000)]
am
36d5e562: am
dee0d05b: (-s ours) am
5c3b7c3a: Merge "Don\'t clear data summary when loader is cancelled" into mnc-dev
* commit '
36d5e562dd8677e16a3478d63e68435637ed9409':
Jason Monk [Thu, 27 Aug 2015 20:15:48 +0000 (20:15 +0000)]
am
0baaeec3: am
296aec41: (-s ours) am
b6b85325: Merge "Fix rotation issues" into mnc-dev
* commit '
0baaeec3b897b095a82a7cc29e299012ca815b09':
Zoltan Szatmary-Ban [Thu, 27 Aug 2015 20:15:44 +0000 (20:15 +0000)]
am
d49d0322: am
b0afdf2f: (-s ours) am
ee77eced: Merge "Check signature match between Cert installer and Settings" into mnc-dev
* commit '
d49d03228d3c094101114fe5def29fdf37c7d024':
Zoltan Szatmary-Ban [Thu, 27 Aug 2015 20:15:40 +0000 (20:15 +0000)]
am
4be34602: am
b0a8c420: (-s ours) am
4bbe3d1f: Update all shown preferences in Settings > Storage
* commit '
4be3460262b7724e58397e7296857a2bd6011e09':
Sasha Levitskiy [Thu, 27 Aug 2015 20:15:37 +0000 (20:15 +0000)]
am
544932fc: am
a5251bbc: (-s ours) am
93b1a5a9: Merge "Fingerprint: Add post enroll call" into mnc-dev
* commit '
544932fc4a444c10458844366076c0211e3ecbe4':
Tim Kilbourn [Thu, 27 Aug 2015 20:15:33 +0000 (20:15 +0000)]
am
c2d6851a: am
ad1aa525: (-s ours) am
49983b99: Show correct text for app link domains.
* commit '
c2d6851ac5cb343aab5ff12265a1a9159b2a7bde':
Jorim Jaggi [Thu, 27 Aug 2015 20:15:30 +0000 (20:15 +0000)]
am
8107a3b1: am
221e0f44: (-s ours) am
b493b291: Merge "Hide screenshot preference when assist is disabled" into mnc-dev
* commit '
8107a3b1e2fbed4c065a8b44a41254ea8b6e9414':
Jeff Sharkey [Thu, 27 Aug 2015 20:15:27 +0000 (20:15 +0000)]
am
4f0205d3: am
6b09d2c9: (-s ours) am
80eba76b: Merge "Move storage when formatting primary disk." into mnc-dev
* commit '
4f0205d31484dd9c3a4cca7c82434b3410f785c9':
Amit Mahajan [Thu, 27 Aug 2015 20:15:24 +0000 (20:15 +0000)]
am
3876ef95: am
5fc2772b: (-s ours) am
01ce80b5: Merge "Remove \'do not translate\' comment for string \'None\'." into mnc-dev
* commit '
3876ef95cada8d7b31f9cac2ad917da6d5acf685':
Sanket Padawe [Thu, 27 Aug 2015 20:15:12 +0000 (20:15 +0000)]
am
2ea49864: am
2d633c97: (-s ours) am
c7777b94: Merge "Locale based string changes in BT." into mnc-dev
* commit '
2ea4986406daead1ffa2cd56f4caae048655abb5':
Sanket Padawe [Thu, 27 Aug 2015 20:15:08 +0000 (20:15 +0000)]
am
0e67389f: am
88701273: (-s ours) am
c9cdf9c8: Merge "Disable CA certificate for EAP-SIM, AKA & AKA\'" into mnc-dev
* commit '
0e67389f254ec5ce4782f076b3a259e2a795fdc2':
Robin Lee [Thu, 27 Aug 2015 20:15:04 +0000 (20:15 +0000)]
am
6d557943: am
d1e93240: (-s ours) am
64e1e15d: Merge "Restore Vpn advanced options on re-init or rotate" into mnc-dev
* commit '
6d557943277e3eac5b65be3f8d50ff5b0b1450e1':
Geoff Mendal [Thu, 27 Aug 2015 20:15:01 +0000 (20:15 +0000)]
am
62b24c74: (-s ours) am
74d8ac2e: (-s ours) am
4a332ee8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
62b24c74a9579dc9e76f4de268084ebbffe5f0fd':
Jason Monk [Thu, 27 Aug 2015 20:14:58 +0000 (20:14 +0000)]
am
06bb8569: am
49c78619: (-s ours) am
4652115f: Merge "Handle uninstall from notifications list" into mnc-dev
* commit '
06bb8569a2a8f79ea25d6691cdc56abbd6053e7c':
Zoltan Szatmary-Ban [Thu, 27 Aug 2015 20:14:55 +0000 (20:14 +0000)]
am
dc8fcbab: am
909ddcca: (-s ours) am
296e0aff: Merge "Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on" into mnc-dev
* commit '
dc8fcbabe7b82a2f4af8d161f15ca57e05231024':
Zoltan Szatmary-Ban [Thu, 27 Aug 2015 20:14:52 +0000 (20:14 +0000)]
am
1a04072c: am
e78d9ab7: (-s ours) am
461a48ba: Merge "Making Settings > Storage multiprofile aware" into mnc-dev
* commit '
1a04072c47cbaa253efdd6d1b8d1113c1cdf9f03':
Christopher Tate [Thu, 27 Aug 2015 20:14:50 +0000 (20:14 +0000)]
am
7cf1e6da: am
2db668d5: (-s ours) am
8023385e: Merge "App link handling is not just for "official" verified handlers" into mnc-dev
* commit '
7cf1e6daa2607f2b75a4c2028e2fb680239325b0':
Amith Yamasani [Thu, 27 Aug 2015 20:14:49 +0000 (20:14 +0000)]
am
1160846a: am
5ce2a7f5: (-s ours) am
7ac21204: Merge "Use localized name for guest user" into mnc-dev
* commit '
1160846ac45f740908262f90547660af65dc6e32':
Jorim Jaggi [Thu, 27 Aug 2015 20:14:48 +0000 (20:14 +0000)]
am
6ea21ffb: am
09c30740: (-s ours) am
2bd619d5: Merge "Text changes to assist & voice input" into mnc-dev
* commit '
6ea21ffb72cf0107565a5fd2cc6630157b71b9a6':
Jeff Sharkey [Thu, 27 Aug 2015 20:14:47 +0000 (20:14 +0000)]
am
cf82dbec: am
31d519fe: (-s ours) am
66b5a58a: Merge "Fix init order so we have something to measure." into mnc-dev
* commit '
cf82dbec38e70aa9a4ae0eb99ad4cbf4b7ae6d83':
Jeff Sharkey [Thu, 27 Aug 2015 20:14:46 +0000 (20:14 +0000)]
am
22bf2806: am
139e1964: (-s ours) am
7616b00b: Merge changes from topic \'mig\' into mnc-dev
* commit '
22bf2806b4bfe4d31d94c2adbfa2d4bac3b25d9f':
Geoff Mendal [Thu, 27 Aug 2015 20:14:44 +0000 (20:14 +0000)]
am
19f5403a: (-s ours) am
479b00cd: (-s ours) am
e21573da: (-s ours) Import translations. DO NOT MERGE
* commit '
19f5403aedfc6e0ac66fa92422096890cdbe49b5':
OSDN Git Service
