OSDN Git Service
Selim Cinek [Thu, 27 Aug 2015 11:34:10 +0000 (11:34 +0000)]
am
d2b6e1ac: (-s ours) am
596ce9ba: Merge "Autocapitalizing the fingerprint names now" into mnc-dev
* commit '
d2b6e1acd0ca0ebd3cfc64295dc19ef2cf1c4455':
Selim Cinek [Thu, 27 Aug 2015 11:34:08 +0000 (11:34 +0000)]
am
412eb5df: (-s ours) am
a8c7c8c8: Merge "Added content description for the fingerprint icon" into mnc-dev
* commit '
412eb5dfdea71902ac64a1392cf9d791b0a5f647':
Selim Cinek [Thu, 27 Aug 2015 11:34:07 +0000 (11:34 +0000)]
am
e0f552c1: (-s ours) am
95ddf903: Merge "Adapted a string in the fingerprint enrollment flow" into mnc-dev
* commit '
e0f552c140c98ad20d97dd139606a4fbf8451982':
Jorim Jaggi [Thu, 27 Aug 2015 11:34:06 +0000 (11:34 +0000)]
am
607e7963: (-s ours) am
58d1995c: Merge "Move PIN/Pattern appear animation to RenderThread (2/2)" into mnc-dev
* commit '
607e796331ce7c32b989d02efb9e303fc2c71bef':
Jason Monk [Thu, 27 Aug 2015 11:34:04 +0000 (11:34 +0000)]
am
9a5dc80d: (-s ours) am
3b521b60: Merge "Battery summary - tint uid 0 icon" into mnc-dev
* commit '
9a5dc80d050fb63fa5f2c8b5877b4b9ecc3123a8':
Jason Monk [Thu, 27 Aug 2015 11:34:03 +0000 (11:34 +0000)]
am
9d5907d0: (-s ours) am
08cb3983: Merge "Update battery optimization strings" into mnc-dev
* commit '
9d5907d03edfec6a2823f908cade6c458644da0b':
Sanket Padawe [Thu, 27 Aug 2015 11:34:02 +0000 (11:34 +0000)]
am
9cbb3549: (-s ours) am
ca258251: Merge "Fix issues in AP dialog arising after clicking on AP preferences." into mnc-dev
* commit '
9cbb3549369b412525dc6485c6b6eba189208e76':
Julia Reynolds [Thu, 27 Aug 2015 11:34:00 +0000 (11:34 +0000)]
am
0b674961: (-s ours) am
9a1c0dce: Handle app uninstall via Storage & USB.
* commit '
0b6749614c3ed78bebf43ab0d9574ace2087c3fd':
Geoff Mendal [Thu, 27 Aug 2015 11:33:59 +0000 (11:33 +0000)]
am
a8b7c118: (-s ours) am
e37e1232: (-s ours) Import translations. DO NOT MERGE
* commit '
a8b7c118f5551797f3fba028ed78162eca346fa4':
Adrian Roos [Thu, 27 Aug 2015 11:33:58 +0000 (11:33 +0000)]
am
d6dc0bb4: (-s ours) am
38c9b9eb: Update FRP warning to spec
* commit '
d6dc0bb46af5ceb0253577716e5a09ddc0145044':
Maurice Lam [Thu, 27 Aug 2015 11:33:57 +0000 (11:33 +0000)]
am
27165dc3: (-s ours) am
36c76014: Merge "[Fingerprint] Show skip button during SUW" into mnc-dev
* commit '
27165dc3e86642b862b9333d82742be5924c72b3':
Geoff Mendal [Thu, 27 Aug 2015 11:33:56 +0000 (11:33 +0000)]
am
61c436d7: (-s ours) am
5376d54e: (-s ours) Import translations. DO NOT MERGE
* commit '
61c436d73c76603d4ccec302984a137ab251c83a':
Svetoslav Ganov [Thu, 27 Aug 2015 11:33:54 +0000 (11:33 +0000)]
am
6356ee4b: (-s ours) am
cce844a7: Merge "Reset permissions and app links when clearing app preferences - settings" into mnc-dev
* commit '
6356ee4bcb7b1fc12337f4f08c6635ffe42668a4':
Jason Monk [Thu, 27 Aug 2015 11:33:53 +0000 (11:33 +0000)]
am
06621a57: (-s ours) am
8bf5f307: Merge "Fix battery detail issues with "Android OS"" into mnc-dev
* commit '
06621a57fd7894ba4835a157616b8b93215da7a7':
Jason Monk [Thu, 27 Aug 2015 11:33:52 +0000 (11:33 +0000)]
am
5b3921e4: (-s ours) am
9927acd3: Merge "Don\'t show disabled apps in ignore optimizations" into mnc-dev
* commit '
5b3921e44ac8e83d6c72f7704395467f7c6558bc':
Guang Zhu [Thu, 27 Aug 2015 11:33:50 +0000 (11:33 +0000)]
am
8a4dda67: (-s ours) am
c1bef743: Prevent monkey from changing adoptable storage settings
* commit '
8a4dda678668c211f512122fa2617fdafb8a2fcb':
Pavel Zhamaitsiak [Thu, 27 Aug 2015 11:33:49 +0000 (11:33 +0000)]
am
8a222530: (-s ours) am
d9e0ed1b: Merge "Add or remove WFC setting when Wireless settings activity is resumed" into mnc-dev
* commit '
8a222530bec3d55c4512fe941a87f653dba8ca23':
Jason Monk [Thu, 27 Aug 2015 11:33:48 +0000 (11:33 +0000)]
am
e2840f1c: (-s ours) am
838c8432: Merge "Remove tuner from development settings" into mnc-dev
* commit '
e2840f1ce34b4d085fc9eb8bcd2fde7dca3587e0':
Maurice Lam [Thu, 27 Aug 2015 11:33:46 +0000 (11:33 +0000)]
am
2f2779ac: (-s ours) am
32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev
* commit '
2f2779acced14bfb2bf6ea4cecc74845a92ce384':
Maurice Lam [Thu, 27 Aug 2015 11:33:45 +0000 (11:33 +0000)]
am
9dd92338: (-s ours) am
3c1f46dc: Merge "[Fingerprint] Send RESULT_CANCELED when back from Add another" into mnc-dev
* commit '
9dd92338d05f3727e6b2b758ae319f20b08d5e7f':
Maurice Lam [Thu, 27 Aug 2015 11:33:43 +0000 (11:33 +0000)]
am
899d0a28: (-s ours) am
e44ceed1: Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev
* commit '
899d0a28943ad7a797c6b8bf6bd1695cc6694f84':
Billy Lau [Thu, 27 Aug 2015 11:33:42 +0000 (11:33 +0000)]
am
3d861fd1: (-s ours) am
d06ba151: Merge "Bug
21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev
* commit '
3d861fd129913305196f4b4587211508343e626d':
Amit Mahajan [Thu, 27 Aug 2015 11:33:40 +0000 (11:33 +0000)]
am
c1d2289b: (-s ours) am
e8357caa: Merge "Fix bug to force to close once change Bearer on APN" into mnc-dev
* commit '
c1d2289bc627cd9b2103ee66e5251b9fa0676022':
Julia Reynolds [Thu, 27 Aug 2015 11:33:39 +0000 (11:33 +0000)]
am
cb271219: (-s ours) am
f516e7dd: Make \'fingerprint\' searchable in Settings.
* commit '
cb271219c386a9a5280cfad63fa973631b552074':
Maurice Lam [Thu, 27 Aug 2015 11:33:38 +0000 (11:33 +0000)]
am
c97e5aba: (-s ours) am
d85fafce: Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev
* commit '
c97e5aba84835ef126bee9cd4c288b4edb5d97fa':
Maurice Lam [Thu, 27 Aug 2015 11:33:36 +0000 (11:33 +0000)]
am
a33b68af: (-s ours) am
d10026cb: Merge "[Fingerprint] Change message in encryption" into mnc-dev
* commit '
a33b68af3e6fac653eb0102fbba3f38d0ba00f07':
Maurice Lam [Thu, 27 Aug 2015 11:33:35 +0000 (11:33 +0000)]
am
ac4b7fac: (-s ours) am
af57ec88: Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev
* commit '
ac4b7fac6b5778f715adf2d71dd92e4408b625a0':
Jim Miller [Thu, 27 Aug 2015 11:33:32 +0000 (11:33 +0000)]
am
d55152af: (-s ours) am
3977df03: Merge "Don\'t launch ConfirmDeviceCredentials multiple times." into mnc-dev
* commit '
d55152afcef90dfe1e0a9c0cd475ecf3e9f4117c':
Geoff Mendal [Thu, 27 Aug 2015 11:33:30 +0000 (11:33 +0000)]
am
bc8c7914: (-s ours) am
1992d5a1: (-s ours) Import translations. DO NOT MERGE
* commit '
bc8c7914287b365a5cbd76b0e28f290cea4da8a6':
Makoto Onuki [Thu, 27 Aug 2015 11:33:27 +0000 (11:33 +0000)]
am
9e95d6ce: (-s ours) am
4dd637a0: Merge "Fix ugly text wrapping on non-english locales" into mnc-dev
* commit '
9e95d6ce9fa49a7a4b748957d71d269f6f0e947e':
Jason Monk [Thu, 27 Aug 2015 11:33:24 +0000 (11:33 +0000)]
am
cb4b45cc: (-s ours) am
178c4099: Merge "Handle monkey crash" into mnc-dev
* commit '
cb4b45cc30f969da52c7aa4c8b9d98240733d245':
Christopher Tate [Thu, 27 Aug 2015 11:33:21 +0000 (11:33 +0000)]
am
55073e09: (-s ours) am
b852fcbd: Merge "Offer \'ask\' as an available app-linking state" into mnc-dev
* commit '
55073e0954aad3378a1754bd08d2f9108b4bd902':
Jim Miller [Thu, 27 Aug 2015 11:33:18 +0000 (11:33 +0000)]
am
7120c7b6: (-s ours) am
bf9a425d: Merge "Simplify FingerprintSettings" into mnc-dev
* commit '
7120c7b6e65557a05b46c7c915aee1a2390fd610':
Julia Reynolds [Thu, 27 Aug 2015 11:33:15 +0000 (11:33 +0000)]
am
75b901c3: (-s ours) am
0c03b50a: Merge "Remove blank switchtext from switch preferences." into mnc-dev
* commit '
75b901c336360bd6f81247305c41361fdfef2b6b':
Billy Lau [Thu, 27 Aug 2015 11:33:04 +0000 (11:33 +0000)]
am
262b64e7: (-s ours) am
90a8a01b: Merge "Bug
21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)..." into mnc-dev
* commit '
262b64e7a994fd07fa5891648908ef98de42ab61':
Christopher Tate [Thu, 27 Aug 2015 11:32:59 +0000 (11:32 +0000)]
am
feb343ad: (-s ours) am
ddaa142a: Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
* commit '
feb343ad74ad4fe5e9b762da99e73682500f9b1a':
Kenny Guy [Thu, 27 Aug 2015 11:32:55 +0000 (11:32 +0000)]
am
e200c475: (-s ours) am
705faddb: Merge "Show disabled trust agents as off." into mnc-dev
* commit '
e200c4759f0f3d4fdfae5b965248050feaabe5ef':
Sanket Padawe [Thu, 27 Aug 2015 11:32:50 +0000 (11:32 +0000)]
am
bee718b7: (-s ours) am
046decca: Merge "Use common xml file for multi-tab settings." into mnc-dev
* commit '
bee718b7b1a9d675f3f652c2691f42a74ae0d559':
Maurice Lam [Thu, 27 Aug 2015 11:32:46 +0000 (11:32 +0000)]
am
d4fa7aa4: (-s ours) am
bec1d295: Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev
* commit '
d4fa7aa48c692fab0fc277021d5054650e0867eb':
Jason Monk [Thu, 27 Aug 2015 11:32:42 +0000 (11:32 +0000)]
am
94b75858: (-s ours) am
50972605: Merge "Disable ignore battery optimization items that can\'t change" into mnc-dev
* commit '
94b7585895751cd4db313ffa708fdff01f34b0d9':
Jason Monk [Thu, 27 Aug 2015 11:32:39 +0000 (11:32 +0000)]
am
5fa374cc: (-s ours) am
4a6b9095: Merge "Change move storage from dropdown pref to dialog" into mnc-dev
* commit '
5fa374cc20f4e0afc9da5644faf9ead86e7c4e57':
Maurice Lam [Thu, 27 Aug 2015 11:32:29 +0000 (11:32 +0000)]
am
58a6af14: (-s ours) am
4595978b: Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-dev
* commit '
58a6af1496e457a799ff1b43b6426fb2812a22ce':
Jim Miller [Thu, 27 Aug 2015 11:32:25 +0000 (11:32 +0000)]
am
2a414b93: (-s ours) am
6b9d7889: Merge "Fixed the layout for the fingerprint renaming" into mnc-dev
* commit '
2a414b9368fcc06bf7c849f8fb982038feaf6e5e':
Maurice Lam [Thu, 27 Aug 2015 11:32:22 +0000 (11:32 +0000)]
am
d7be0656: (-s ours) am
f90628c6: Merge "[Fingerprint] Export FingerprintEnrollIntroduction" into mnc-dev
* commit '
d7be0656ff51e20585916af19680a2c55ce03470':
Jason Monk [Thu, 27 Aug 2015 11:32:18 +0000 (11:32 +0000)]
am
4a381902: (-s ours) am
cd075edf: Merge "Fix Help menu for PrivateVolumeSettings" into mnc-dev
* commit '
4a3819027a51681ed416177a3ecd0d1b22cfc82a':
Geoff Mendal [Thu, 27 Aug 2015 11:32:15 +0000 (11:32 +0000)]
am
e1875783: (-s ours) am
f3907176: (-s ours) Import translations. DO NOT MERGE
* commit '
e18757830920dcce30c78942582a0702a75806d0':
Narayan Kamath [Thu, 27 Aug 2015 11:32:13 +0000 (11:32 +0000)]
am
45e1e1ec: (-s ours) am
83a25842: Merge "Lose some deprecated test annotations."
* commit '
45e1e1ec928b236db0194b304361735fd93161ef':
xinhe [Thu, 27 Aug 2015 11:32:11 +0000 (11:32 +0000)]
am
e9c822b0: (-s ours) am
d7fb46de: Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev
* commit '
e9c822b0c6f29d920eeed4c19c90e202c68a70b5':
Jim Miller [Thu, 27 Aug 2015 11:32:09 +0000 (11:32 +0000)]
am
52374856: (-s ours) am
e641e7d7: Merge "Postpone call to postEnroll() until we actually leave activity." into mnc-dev
* commit '
52374856e8d53f38ed1f313591598275316e4376':
Jason Monk [Thu, 27 Aug 2015 11:32:06 +0000 (11:32 +0000)]
am
81044820: (-s ours) am
acc70a3a: Merge "Add content description to wifi networks" into mnc-dev
* commit '
810448204fd3fa4fd305fd40ee89da81cbd57d0f':
Billy Lau [Thu, 27 Aug 2015 11:32:04 +0000 (11:32 +0000)]
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 '
45b27c3a04b997362d0884d2e52aa54d8fff1319':
Jorim Jaggi [Thu, 27 Aug 2015 11:32:02 +0000 (11:32 +0000)]
am
8f37d4bc: (-s ours) am
8505d4a5: Merge "Disable voice input if assist is voice service" into mnc-dev
* commit '
8f37d4bc11841a3084a31471756b7d61d433c2eb':
Jason Monk [Thu, 27 Aug 2015 11:32:01 +0000 (11:32 +0000)]
am
31e05386: (-s ours) am
7713fe26: Merge "Disable notification volume when user restricted" into mnc-dev
* commit '
31e0538651f07e6fea67bf3dc3605b227ed26dea':
Martijn Coenen [Thu, 27 Aug 2015 11:31:59 +0000 (11:31 +0000)]
am
90d21f09: (-s ours) am
8d9bb1ae: Merge "Fix up Tap and Pay how it works." into mnc-dev
* commit '
90d21f096783e5d8fd3c44a0e69dd375bf301bd1':
Jason Monk [Thu, 27 Aug 2015 11:31:58 +0000 (11:31 +0000)]
am
34e7b4cd: (-s ours) am
53dd1d4d: Merge "Fix app icon size" into mnc-dev
* commit '
34e7b4cd0578527e9f86affb66048ea43870bdcb':
Sanket Padawe [Thu, 27 Aug 2015 11:31:56 +0000 (11:31 +0000)]
am
c319bac5: (-s ours) am
7995ca41: Use same technology type for LTE/4G
* commit '
c319bac558a7dae2e8df60a8ebc117d8bd712621':
Chris Wren [Thu, 27 Aug 2015 11:31:55 +0000 (11:31 +0000)]
am
ae15849d: (-s ours) am
2f8bb8ea: Merge "import new view enums into MetricsLogger" into mnc-dev
* commit '
ae15849d114f6f0e24acb8acf5f7528aeb4d852a':
Geoff Mendal [Thu, 27 Aug 2015 11:31:53 +0000 (11:31 +0000)]
am
329cea48: (-s ours) am
536ed184: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
329cea489bee113ff6534ba8cd0f981052d22bc8':
Zoltan Szatmary-Ban [Thu, 27 Aug 2015 11:31:52 +0000 (11:31 +0000)]
am
30a73372: (-s ours) am
098c296d: Merge "Do not throw exception when MeasurementDetails.mediaSize is empty" into mnc-dev
* commit '
30a73372c4498b671b728e29ff1b7391e58057c5':
Geoff Mendal [Thu, 27 Aug 2015 11:31:51 +0000 (11:31 +0000)]
am
88afe4a4: (-s ours) am
da15ade8: (-s ours) Import translations. DO NOT MERGE
* commit '
88afe4a4d7e4cb876908c1898f610dabbd5c7202':
Robin Lee [Thu, 27 Aug 2015 11:31:50 +0000 (11:31 +0000)]
am
27c45eb9: (-s ours) am
7ba46433: Merge "Match getLegacyVpn calls to changed interface" into mnc-dev
* commit '
27c45eb9f24a6fe12ad61199b90bb8fdbd0df4db':
Rubin Xu [Thu, 27 Aug 2015 11:31:48 +0000 (11:31 +0000)]
am
20eb7e10: (-s ours) am
331b9823: Merge "Remove unused MediaFormat activity" into mnc-dev
* commit '
20eb7e10f27f564cb40ad5f0398fb2e8c17d897a':
Jason Monk [Thu, 27 Aug 2015 11:31:46 +0000 (11:31 +0000)]
am
4484cc4f: (-s ours) am
7ab3cf94: Merge "Fix wifi not re-ordering" into mnc-dev
* commit '
4484cc4ff4c1bef78ac52d8abd8351b09a9a1e1b':
Julia Reynolds [Thu, 27 Aug 2015 11:31:44 +0000 (11:31 +0000)]
am
bc79da2b: (-s ours) am
ddd887af: Prevent crash when removing an account.
* commit '
bc79da2b3e32fe86628e61aedba57d391053a382':
Julia Reynolds [Thu, 27 Aug 2015 11:31:42 +0000 (11:31 +0000)]
am
46ea05da: (-s ours) am
963e3fdd: Merge "Talkback improvements for Settings screens." into mnc-dev
* commit '
46ea05da72db4719faed1c3ec173448d7a2f0706':
Jason Monk [Thu, 27 Aug 2015 11:31:39 +0000 (11:31 +0000)]
am
dee0d05b: (-s ours) am
5c3b7c3a: Merge "Don\'t clear data summary when loader is cancelled" into mnc-dev
* commit '
dee0d05b5c6797b860fef9e6591249391956edc3':
Jason Monk [Thu, 27 Aug 2015 11:31:37 +0000 (11:31 +0000)]
am
296aec41: (-s ours) am
b6b85325: Merge "Fix rotation issues" into mnc-dev
* commit '
296aec4127468ca79c1db60672a2cb0d39e3b0c1':
Zoltan Szatmary-Ban [Thu, 27 Aug 2015 11:31:34 +0000 (11:31 +0000)]
am
b0afdf2f: (-s ours) am
ee77eced: Merge "Check signature match between Cert installer and Settings" into mnc-dev
* commit '
b0afdf2f5ab38b947cee443979d9833bd1af03c2':
Zoltan Szatmary-Ban [Thu, 27 Aug 2015 11:31:32 +0000 (11:31 +0000)]
am
b0a8c420: (-s ours) am
4bbe3d1f: Update all shown preferences in Settings > Storage
* commit '
b0a8c4203c859ee26d1989387e0406d0a86da6f5':
Sasha Levitskiy [Thu, 27 Aug 2015 11:31:30 +0000 (11:31 +0000)]
am
a5251bbc: (-s ours) am
93b1a5a9: Merge "Fingerprint: Add post enroll call" into mnc-dev
* commit '
a5251bbcffc5e740c278b8d600481e705a1e9277':
Tim Kilbourn [Thu, 27 Aug 2015 11:31:28 +0000 (11:31 +0000)]
am
ad1aa525: (-s ours) am
49983b99: Show correct text for app link domains.
* commit '
ad1aa5252fcef6ec6537f0fa9da3e84818a78512':
Jorim Jaggi [Thu, 27 Aug 2015 11:31:27 +0000 (11:31 +0000)]
am
221e0f44: (-s ours) am
b493b291: Merge "Hide screenshot preference when assist is disabled" into mnc-dev
* commit '
221e0f4400e25ee40bf3428c89b8de5a9415ba9a':
Jeff Sharkey [Thu, 27 Aug 2015 11:31:25 +0000 (11:31 +0000)]
am
6b09d2c9: (-s ours) am
80eba76b: Merge "Move storage when formatting primary disk." into mnc-dev
* commit '
6b09d2c9825a0936027e509f36ad04ccc12883d5':
Amit Mahajan [Thu, 27 Aug 2015 11:31:23 +0000 (11:31 +0000)]
am
5fc2772b: (-s ours) am
01ce80b5: Merge "Remove \'do not translate\' comment for string \'None\'." into mnc-dev
* commit '
5fc2772b5d3486f2b7ad48556ff945a0b3e267e5':
Sanket Padawe [Thu, 27 Aug 2015 11:31:22 +0000 (11:31 +0000)]
am
2d633c97: (-s ours) am
c7777b94: Merge "Locale based string changes in BT." into mnc-dev
* commit '
2d633c9744a0b2ae7373068cdca752777df439d1':
Sanket Padawe [Thu, 27 Aug 2015 11:31:20 +0000 (11:31 +0000)]
am
88701273: (-s ours) am
c9cdf9c8: Merge "Disable CA certificate for EAP-SIM, AKA & AKA\'" into mnc-dev
* commit '
88701273e3056d86fb2f442400de9dec994d669e':
Robin Lee [Thu, 27 Aug 2015 11:31:17 +0000 (11:31 +0000)]
am
d1e93240: (-s ours) am
64e1e15d: Merge "Restore Vpn advanced options on re-init or rotate" into mnc-dev
* commit '
d1e93240aadca200462de351415abed5e856b58c':
Geoff Mendal [Thu, 27 Aug 2015 11:31:14 +0000 (11:31 +0000)]
am
74d8ac2e: (-s ours) am
4a332ee8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
74d8ac2e274f0a19f5164191e8dd00dd8e741428':
Jason Monk [Thu, 27 Aug 2015 11:31:10 +0000 (11:31 +0000)]
am
49c78619: (-s ours) am
4652115f: Merge "Handle uninstall from notifications list" into mnc-dev
* commit '
49c7861984dfe4bf4516a5666995e3b36c0f7fd7':
Zoltan Szatmary-Ban [Thu, 27 Aug 2015 11:31:07 +0000 (11:31 +0000)]
am
909ddcca: (-s ours) am
296e0aff: Merge "Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on" into mnc-dev
* commit '
909ddcca43803078c838da0c6b9a9c84ddb715a6':
Zoltan Szatmary-Ban [Thu, 27 Aug 2015 11:31:02 +0000 (11:31 +0000)]
am
e78d9ab7: (-s ours) am
461a48ba: Merge "Making Settings > Storage multiprofile aware" into mnc-dev
* commit '
e78d9ab78f379cfa4e9ada05115ffc16621f1d5e':
Christopher Tate [Thu, 27 Aug 2015 11:30:57 +0000 (11:30 +0000)]
am
2db668d5: (-s ours) am
8023385e: Merge "App link handling is not just for "official" verified handlers" into mnc-dev
* commit '
2db668d547674e787f2c8fef101c7385ad9677a6':
Amith Yamasani [Thu, 27 Aug 2015 11:30:42 +0000 (11:30 +0000)]
am
5ce2a7f5: (-s ours) am
7ac21204: Merge "Use localized name for guest user" into mnc-dev
* commit '
5ce2a7f5c46ddced28400f62f4daa87269fc5ff5':
Jorim Jaggi [Thu, 27 Aug 2015 11:30:36 +0000 (11:30 +0000)]
am
09c30740: (-s ours) am
2bd619d5: Merge "Text changes to assist & voice input" into mnc-dev
* commit '
09c307401893886a7d82baa520f33d6956b56de4':
Jeff Sharkey [Thu, 27 Aug 2015 11:30:29 +0000 (11:30 +0000)]
am
31d519fe: (-s ours) am
66b5a58a: Merge "Fix init order so we have something to measure." into mnc-dev
* commit '
31d519fe37f6132f01b6193fec91d9f9b5b97908':
Jeff Sharkey [Thu, 27 Aug 2015 11:30:22 +0000 (11:30 +0000)]
am
139e1964: (-s ours) am
7616b00b: Merge changes from topic \'mig\' into mnc-dev
* commit '
139e19647169a736d1f8b1b71479bd36742a2341':
Geoff Mendal [Thu, 27 Aug 2015 11:30:06 +0000 (11:30 +0000)]
am
479b00cd: (-s ours) am
e21573da: (-s ours) Import translations. DO NOT MERGE
* commit '
479b00cd40c0173ba3e51f072efa0aa5e432234c':
Geoff Mendal [Wed, 26 Aug 2015 14:33:36 +0000 (14:33 +0000)]
am
ebf23a76: (-s ours) am
3b545b41: (-s ours) am
fbfdede1: (-s ours) Import translations. DO NOT MERGE
* commit '
ebf23a763f240b203480d53bc29895d14e230f89':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 26 Aug 2015 14:25:58 +0000 (14:25 +0000)]
am
3b545b41: (-s ours) am
fbfdede1: (-s ours) Import translations. DO NOT MERGE
* commit '
3b545b41b931919fab3528e2bbb81ded620378b2':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 26 Aug 2015 14:19:37 +0000 (14:19 +0000)]
am
fbfdede1: (-s ours) Import translations. DO NOT MERGE
* commit '
fbfdede15b6a81655a5b4fc274340ba58c3d4a99':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 26 Aug 2015 14:12:08 +0000 (07:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1d08cdfb6ad7723d4e0bd578b0b699fc9d2389db
Auto-generated-cl: translation import
Jim Miller [Tue, 25 Aug 2015 23:33:55 +0000 (23:33 +0000)]
am
d63408d9: am
d7e4cd9b: am
f7fc6429: Merge "Don\'t attempt to remove fp templates if none are enrolled" into mnc-dr-dev
* commit '
d63408d91576277acec9c2169e48eff839516470':
Don't attempt to remove fp templates if none are enrolled
Jim Miller [Tue, 25 Aug 2015 23:25:08 +0000 (23:25 +0000)]
am
d7e4cd9b: am
f7fc6429: Merge "Don\'t attempt to remove fp templates if none are enrolled" into mnc-dr-dev
* commit '
d7e4cd9b1edb25651d3fa306e389b7ec858c1ed8':
Don't attempt to remove fp templates if none are enrolled
Jim Miller [Tue, 25 Aug 2015 23:18:54 +0000 (23:18 +0000)]
am
f7fc6429: Merge "Don\'t attempt to remove fp templates if none are enrolled" into mnc-dr-dev
* commit '
f7fc6429874fd02bc3670bce98b2158d2a78aecd':
Don't attempt to remove fp templates if none are enrolled
Jim Miller [Tue, 25 Aug 2015 23:08:55 +0000 (23:08 +0000)]
Merge "Don't attempt to remove fp templates if none are enrolled" into mnc-dr-dev
Wei Liu [Tue, 25 Aug 2015 18:37:40 +0000 (18:37 +0000)]
am
70238114: am
6e58d516: Refactor UidDetailProvider and its dependencies to SettingsLib.
* commit '
702381144781d68551e765dcf8b23cf3dbca3ce5':
Refactor UidDetailProvider and its dependencies to SettingsLib.
Wei Liu [Tue, 25 Aug 2015 18:32:41 +0000 (18:32 +0000)]
am
6e58d516: Refactor UidDetailProvider and its dependencies to SettingsLib.
* commit '
6e58d516f05bbceabdddd3aa08a94fcc32858e71':
Refactor UidDetailProvider and its dependencies to SettingsLib.
Wei Liu [Tue, 25 Aug 2015 18:11:06 +0000 (18:11 +0000)]
am
ad50b81f: am
0e309b86: Merge "Move SummaryForAllUidLoader to SettingsLib." into cw-e-dev
* commit '
ad50b81f492fb01390679f697d1f340da35ef28c':
Move SummaryForAllUidLoader to SettingsLib.
Wei Liu [Tue, 25 Aug 2015 18:03:37 +0000 (18:03 +0000)]
am
0e309b86: Merge "Move SummaryForAllUidLoader to SettingsLib." into cw-e-dev
* commit '
0e309b867d1872b8cd0d6d435e10d6d3be48a3bd':
Move SummaryForAllUidLoader to SettingsLib.
Wei Liu [Tue, 25 Aug 2015 00:29:04 +0000 (17:29 -0700)]
Refactor UidDetailProvider and its dependencies to SettingsLib.
so that it can be reused by Wear app data usage.
Change-Id: Id05f888274e15fbeffa175ee8073de02a8966867
OSDN Git Service
