OSDN Git Service
Chris Wren [Thu, 27 Aug 2015 07:21:28 +0000 (07:21 +0000)]
am
70811001: (-s ours) am
208934ff: Merge "fix build by restoring deleted enum" into mnc-dev
* commit '
70811001a372766c7a54d8daec2b428706b4f253':
Julia Reynolds [Thu, 27 Aug 2015 07:21:13 +0000 (07:21 +0000)]
am
11ece5ce: (-s ours) am
fbd0a444: Merge "Remove personal/device group from sideloading screen." into mnc-dev
* commit '
11ece5ceec31e052672be46fd7a5433a0ae15158':
Jason Monk [Thu, 27 Aug 2015 07:20:49 +0000 (07:20 +0000)]
am
a8d5740c: (-s ours) am
28a07ff0: Merge "Fix demo mode issues" into mnc-dev
* commit '
a8d5740c83746e3843af0faba755d1ff56b1520a':
Chris Wren [Thu, 27 Aug 2015 07:20:15 +0000 (07:20 +0000)]
am
83e5a72b: (-s ours) am
4502bfb8: Merge "add new enums to MetricsConstans" into mnc-dev
* commit '
83e5a72b672d9c9787ec0fcb42335004313e7d36':
Jason Monk [Thu, 27 Aug 2015 07:20:01 +0000 (07:20 +0000)]
am
b1d0e8ac: (-s ours) am
59b1dfef: Merge "Show volume restriction toast on all users" into mnc-dev
* commit '
b1d0e8acab59567b2fe409c12b8f0d94ac79f184':
Geoff Mendal [Thu, 27 Aug 2015 07:19:53 +0000 (07:19 +0000)]
am
876e7c17: (-s ours) am
c021aaaf: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
876e7c175bca24954a4ad01fb9816b56d01a37b6':
Neil Fuller [Thu, 27 Aug 2015 07:19:41 +0000 (07:19 +0000)]
am
f6db67c8: (-s ours) am
3ecbca50: am
886630c0: Merge "Switch shutdownInput / shutdownOutput to using Os.shutdown."
* commit '
f6db67c8f3fd0c57944a51289b5ef63c4f746f8a':
Rubin Xu [Thu, 27 Aug 2015 07:19:32 +0000 (07:19 +0000)]
am
87ea7e2f: (-s ours) am
cf9aebf1: Merge "Remove ExternalStorageFormatter" into mnc-dev
* commit '
87ea7e2fb6b81a53664a404be52d03025705f7e2':
Esteban Talavera [Thu, 27 Aug 2015 07:19:24 +0000 (07:19 +0000)]
am
82bd3ae0: (-s ours) am
0ec43f89: Merge "Use correct user when filtering app link candidates" into mnc-dev
* commit '
82bd3ae008dd0e1313381deffece01c31ce92110':
Esteban Talavera [Thu, 27 Aug 2015 07:19:12 +0000 (07:19 +0000)]
am
81d511ab: (-s ours) am
22921603: Merge "Don\'t send app links to parent profile if status == never" into mnc-dev
* commit '
81d511abe0bf352e5bcb8fe7f946a70b51000fe5':
Billy Lau [Thu, 27 Aug 2015 07:18:46 +0000 (07:18 +0000)]
am
462ab255: (-s ours) am
96d00ab3: Merge "Bug:
21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev
* commit '
462ab2555e4eb4a8034e166e2c89d06cd1102af4':
Zhijun He [Thu, 27 Aug 2015 07:18:04 +0000 (07:18 +0000)]
am
6fe81428: (-s ours) am
4fb81253: Camera metadata: fix typos.
* commit '
6fe81428df10fe792b792cd56219ca1f9d3be6d7':
Geoff Mendal [Thu, 27 Aug 2015 07:17:12 +0000 (07:17 +0000)]
am
15a7ef90: (-s ours) am
1962ad3e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
15a7ef90d6110e5891573c86a4c0c7eb17157a02':
Geoff Mendal [Thu, 27 Aug 2015 07:16:22 +0000 (07:16 +0000)]
am
6c9fd7ad: (-s ours) am
d64ba82e: (-s ours) Import translations. DO NOT MERGE
* commit '
6c9fd7ad1276fce19d189519940fc917ae452878':
Raph Levien [Thu, 27 Aug 2015 07:15:39 +0000 (07:15 +0000)]
am
4a4a4505: (-s ours) am
1b3d0351: Merge "Improve Html.toHtml() documentation" into mnc-dev
* commit '
4a4a4505d5287940a5a9dc64711bc6da7596bdba':
Amith Yamasani [Thu, 27 Aug 2015 07:15:04 +0000 (07:15 +0000)]
am
c8e4f119: (-s ours) am
292eb65f: Merge "Fix new user creation regression due to vold remount calls" into mnc-dev
* commit '
c8e4f119759b59ec17f9a35b95ce9086772f5db6':
Amith Yamasani [Thu, 27 Aug 2015 07:14:11 +0000 (07:14 +0000)]
am
724d13b2: (-s ours) am
5449ee07: Merge "Avoid IPC call with an empty array" into mnc-dev
* commit '
724d13b28801a84f6856062c4d97394ef16a0799':
Sanket Padawe [Thu, 27 Aug 2015 07:13:14 +0000 (07:13 +0000)]
am
51705fab: (-s ours) am
233bd3ce: Merge "Changes security for Passpoint to EAP security from "Passpoint"." into mnc-dev
* commit '
51705faba5f5a352000070bd2e2081d37f26b5f7':
Adrian Roos [Thu, 27 Aug 2015 07:12:31 +0000 (07:12 +0000)]
am
730e223d: (-s ours) am
d374c20f: Merge "Fix flash of uninitialized surface" into mnc-dev
* commit '
730e223d3742225c829e578ff34c18c5912b7a86':
Carlos Valdivia [Thu, 27 Aug 2015 07:12:06 +0000 (07:12 +0000)]
am
d4d60217: (-s ours) am
97cf0f1d: Merge "Revert "Revert "Security: AccountChooser shouldn\'t auto reveal accounts.""" into mnc-dev
* commit '
d4d6021785c898b9c0b6421d2a1ddf0c95c7f8a3':
Mady Mellor [Thu, 27 Aug 2015 07:11:17 +0000 (07:11 +0000)]
am
b5d3e0cc: (-s ours) am
1c277ca8: Merge "Fix: line slop shouldn\'t always increase / decrease by one line" into mnc-dev
* commit '
b5d3e0cc10530362d144216fe7507e82640b5340':
Mady Mellor [Thu, 27 Aug 2015 07:10:25 +0000 (07:10 +0000)]
am
b0fd6bf0: (-s ours) am
a9f07ccf: Merge "Fix line slop issue at end of line for Thai & CJK" into mnc-dev
* commit '
b0fd6bf0d98a87af5dfb7def76c32b5d938dd247':
Wale Ogunwale [Thu, 27 Aug 2015 07:09:41 +0000 (07:09 +0000)]
am
68ba2310: (-s ours) am
26b0f1e4: Merge "Revert "Finish already paused activity if it should be finished after pausing"" into mnc-dev
* commit '
68ba23105b9527db3dccb90faa1ec048063b4054':
John Reck [Thu, 27 Aug 2015 07:09:21 +0000 (07:09 +0000)]
am
523be5f8: (-s ours) am
8657d9e8: Merge "JNI optimization tweaks to Paint high-frequency methods" into mnc-dev
* commit '
523be5f83280dbd90cec28d7c2674e7b341caf64':
Chris Craik [Thu, 27 Aug 2015 07:09:03 +0000 (07:09 +0000)]
am
0fa464e7: (-s ours) am
9f004920: Merge "Reduce cost of span type checking" into mnc-dev
* commit '
0fa464e7f5ca410035c8bf22281f1db588acf738':
Robin Lee [Thu, 27 Aug 2015 07:08:47 +0000 (07:08 +0000)]
am
720252a9: (-s ours) am
6795a2ae: Check legacy VPN is connected before alerting
* commit '
720252a94814dbf48c422ac55babaa0b5596c67a':
Jorim Jaggi [Thu, 27 Aug 2015 07:08:20 +0000 (07:08 +0000)]
am
7ea86aa8: (-s ours) am
0c758805: Merge "Fix empty keyguard for once and all" into mnc-dev
* commit '
7ea86aa87c0dbd25d409ba7f12ddff8e00591ee3':
Jinsuk Kim [Thu, 27 Aug 2015 07:07:43 +0000 (07:07 +0000)]
am
a8367bc8: (-s ours) am
256642aa: Merge "CEC: Do not switch language if the new one is same as the old one" into mnc-dev
* commit '
a8367bc85a0145d650bd417f7fc62164578770c0':
Elliott Hughes [Thu, 27 Aug 2015 07:07:08 +0000 (07:07 +0000)]
am
1bd6d9c9: (-s ours) am
94fed352: am
188af044: Merge "Revert "frameworks/base: libexpat now exports its headers.""
* commit '
1bd6d9c979eddeaa8fb602383fa227db8e741ef9':
Elliott Hughes [Thu, 27 Aug 2015 07:06:44 +0000 (07:06 +0000)]
am
aa4a994d: (-s ours) am
4d4c4507: am
220b61f1: Merge "frameworks/base: libexpat now exports its headers."
* commit '
aa4a994d5c6e136752b41964d655ff610b345cd0':
David Friedman [Thu, 27 Aug 2015 07:06:28 +0000 (07:06 +0000)]
am
33bbc0ed: (-s ours) am
c1541571: am
1c231da0: am
48143e6a: Docs: Fixes to Preview "Program Overview" page; rewording on "Support" page
* commit '
33bbc0ed6a4fe5a5df40e5c528c1c479aa89655d':
Robin Lee [Thu, 27 Aug 2015 07:06:11 +0000 (07:06 +0000)]
am
dcc4b259: (-s ours) am
f180fe31: Merge "Legacy VPN calls to require a userID" into mnc-dev
* commit '
dcc4b2597fe61b5745d47dafd8b68fee7b1fa576':
Raph Levien [Thu, 27 Aug 2015 07:05:52 +0000 (07:05 +0000)]
am
3991abf9: (-s ours) am
5d1654a9: Merge "Fix StaticLayout crash when maxLines = 0" into mnc-dev
* commit '
3991abf987bff5519f7f2de478fc1a4d918546b0':
Robert Greenwalt [Thu, 27 Aug 2015 07:05:20 +0000 (07:05 +0000)]
am
313e8adf: (-s ours) am
1570b6b3: Merge "Enable EMERGENCY mobile connections." into mnc-dev
* commit '
313e8adfd04399263576711712649e6fdd3a9fe5':
Robert Greenwalt [Thu, 27 Aug 2015 07:04:47 +0000 (07:04 +0000)]
am
49a60bb3: (-s ours) am
1ebcb6f8: Merge "Fix permissions." into mnc-dev
* commit '
49a60bb31099ee0f95bda67707beede3faa78c0a':
Chris Banes [Thu, 27 Aug 2015 07:04:27 +0000 (07:04 +0000)]
am
f604d486: (-s ours) am
77cae786: am
98b1f102: am
c2b0d1d4: Merge "Support Library v22.2.0 API diff" into mnc-preview-docs
* commit '
f604d4866f2ea8bceccfc5465631f6acd97eb981':
John Reck [Thu, 27 Aug 2015 07:04:19 +0000 (07:04 +0000)]
am
d179ca49: (-s ours) am
2c7ed6e8: Merge "Improve ImageView drawable re-use" into mnc-dev
* commit '
d179ca49ea83c36886b0822c2a6e997477dd81ee':
John Reck [Thu, 27 Aug 2015 07:04:09 +0000 (07:04 +0000)]
am
8e83b783: (-s ours) am
525ac80d: Merge "Create a thread_local cache for textLocale" into mnc-dev
* commit '
8e83b783fab5c257b0577a0bd4396be2f4e2779c':
David Friedman [Thu, 27 Aug 2015 07:04:01 +0000 (07:04 +0000)]
am
8e41f1f3: (-s ours) am
a2c2cc42: am
3f831568: am
6fb22b4e: Docs: Revisions to top DAC landing page and several Preview-page revisions.
* commit '
8e41f1f338690dcfca8a15047205694828dd3133':
Roshan Pius [Thu, 27 Aug 2015 07:03:53 +0000 (07:03 +0000)]
am
7818bd37: (-s ours) am
1cb0de17: Merge "Correct the comparison done in removeAdapter." into mnc-dev
* commit '
7818bd37e9f81e365dccfe82005844c7a7f329e2':
Paul Jensen [Thu, 27 Aug 2015 07:03:45 +0000 (07:03 +0000)]
Paul Jensen [Thu, 27 Aug 2015 07:03:36 +0000 (07:03 +0000)]
am
48090be8: (-s ours) am
bbce221e: Merge "Fallback to Cellular if WiFi fails to validate" into mnc-dev
* commit '
48090be81a594b167266ddf14c8b50d41a8a0abd':
Paul Jensen [Thu, 27 Aug 2015 07:03:23 +0000 (07:03 +0000)]
am
5721226e: (-s ours) am
d8cdba0d: Merge "Prepare some ConnectivityService logic for fallback to Cellular change" into mnc-dev
* commit '
5721226e3ed5f7b40ac3a43a9e5a71bb2f87de01':
Paul Jensen [Thu, 27 Aug 2015 07:02:58 +0000 (07:02 +0000)]
am
9c2df94f: (-s ours) am
00c64f7c: Merge "Add android.net.CaptivePortal class for captive-portal-handling-app callbacks" into mnc-dev
* commit '
9c2df94fbcd764e9fd9ee48cec614d47821b4464':
Tom Hudson [Thu, 27 Aug 2015 07:02:20 +0000 (07:02 +0000)]
am
6ff93d48: (-s ours) am
9613e9b7: Merge "New setLocalMatrix() operation for HWUI" into mnc-dev
* commit '
6ff93d486ca383331b69320c2d6a09e395c65367':
Bart Sears [Thu, 27 Aug 2015 07:02:06 +0000 (07:02 +0000)]
Svetoslav [Thu, 27 Aug 2015 07:01:55 +0000 (07:01 +0000)]
am
04745480: (-s ours) am
664251a2: Merge "Fix build" into mnc-dev
* commit '
047454803997a8709f2ca17ff8ebd6fcf038500b':
Bart Sears [Thu, 27 Aug 2015 07:01:46 +0000 (07:01 +0000)]
am
b7508fc1: (-s ours) am
1aa40492: Merge "Revert "Security: AccountChooser shouldn\'t auto reveal accounts."" into mnc-dev
* commit '
b7508fc159901617b5f07772b548839552bebf10':
Eino-Ville Talvala [Thu, 27 Aug 2015 07:01:39 +0000 (07:01 +0000)]
am
aebf04e5: (-s ours) am
a2cd9c56: Merge "Camera2: Reorganize high-speed recording API slightly" into mnc-dev
* commit '
aebf04e5dfaa649874763c486a18eb7957f2dcdc':
David Friedman [Thu, 27 Aug 2015 07:01:30 +0000 (07:01 +0000)]
Dirk Dougherty [Thu, 27 Aug 2015 07:01:15 +0000 (07:01 +0000)]
am
df6a1155: (-s ours) am
d75391e0: am
8d56096b: am
f739ad7f: Fix typos in preview support.
* commit '
df6a11556454f146cb678c8305db729fdea9ce33':
Carlos Valdivia [Thu, 27 Aug 2015 07:00:31 +0000 (07:00 +0000)]
am
5e424a98: (-s ours) am
319883c8: Merge "Security: AccountChooser shouldn\'t auto reveal accounts." into mnc-dev
* commit '
5e424a9854c18047ff445604ff0df75f27b32158':
Adrian Roos [Thu, 27 Aug 2015 06:59:21 +0000 (06:59 +0000)]
am
2ffde8ff: (-s ours) am
83e9525c: Merge "Fix premature clearing of clearable sysui flags" into mnc-dev
* commit '
2ffde8ff80c75e18c64b048e92809392b29e0fb2':
Dianne Hackborn [Thu, 27 Aug 2015 06:58:23 +0000 (06:58 +0000)]
am
40d23c1a: (-s ours) am
a681d7d9: Merge "Improve alarm manager docs." into mnc-dev
* commit '
40d23c1a266125ee17132ab8a6b341ea8efcf6b7':
John Reck [Thu, 27 Aug 2015 06:57:52 +0000 (06:57 +0000)]
am
2a018b01: (-s ours) am
6ed4b9df: Merge "Deep-copying sucks when all you want is a borrow" into mnc-dev
* commit '
2a018b01af0c4cd18c8ce8a6cdf63c120604d9a2':
John Reck [Thu, 27 Aug 2015 06:57:27 +0000 (06:57 +0000)]
am
c2d0d090: (-s ours) am
b7ba1220: Teach ImageView to recycle internal drawables
* commit '
c2d0d09015d440978d2638da96787fad6634704e':
Svet Ganov [Thu, 27 Aug 2015 06:56:48 +0000 (06:56 +0000)]
am
1d8cf531: (-s ours) am
171fe6ac: Merge "Add an API for apps to query if a permisison is denied by policy." into mnc-dev
* commit '
1d8cf5316ccb6faf1e94b42ef4060c24be54ac06':
John Reck [Thu, 27 Aug 2015 06:56:03 +0000 (06:56 +0000)]
am
75bcfeab: (-s ours) am
4ee9b23a: Merge "Delete dead code" into mnc-dev
* commit '
75bcfeabb982d4fcddff12664ecf761e5d3c6e97':
Adrian Roos [Thu, 27 Aug 2015 06:55:04 +0000 (06:55 +0000)]
am
172d48cf: (-s ours) am
4d8134c1: Merge "Fix black keyguard / missing status bar" into mnc-dev
* commit '
172d48cf87e62aa378cd20766f452b2acdb197fa':
Todd Kennedy [Thu, 27 Aug 2015 06:54:08 +0000 (06:54 +0000)]
am
ea0b945b: (-s ours) am
d80cf910: Merge "Allow codepath changes for new OTA packages" into mnc-dev
* commit '
ea0b945b7313cd33fb0eac0687c0cc1da78bd59b':
Dianne Hackborn [Thu, 27 Aug 2015 06:53:41 +0000 (06:53 +0000)]
am
cc964850: (-s ours) am
0e7d497c: Merge "Fix issue #
22328792: Fix scalability issues in AssistStructure" into mnc-dev
* commit '
cc9648500c2d528c0bfe488ab7b5a5e0fd3cd66e':
Fyodor Kupolov [Thu, 27 Aug 2015 06:53:05 +0000 (06:53 +0000)]
am
9be2a462: (-s ours) am
a1790304: Do not return devices when caller has no location permission
* commit '
9be2a462c829dfb09bca837c07d1197a1db6e9e0':
Christopher Tate [Thu, 27 Aug 2015 06:52:24 +0000 (06:52 +0000)]
am
e41a21e1: (-s ours) am
adebbeba: Merge "Remote extraneous debugging log message" into mnc-dev
* commit '
e41a21e1c288a9a16c56178253993d51f5c74516':
Jeff Brown [Thu, 27 Aug 2015 06:52:01 +0000 (06:52 +0000)]
Jeff Brown [Thu, 27 Aug 2015 06:51:35 +0000 (06:51 +0000)]
am
cb23b7e8: (-s ours) am
c1aebfa0: Merge "Clean up USB Manager and fix ADB." into mnc-dev
* commit '
cb23b7e89b7222a9593d0b1d93fc0e0fd7b3a415':
Raph Levien [Thu, 27 Aug 2015 06:51:17 +0000 (06:51 +0000)]
am
021ee214: (-s ours) am
968f9fdf: Merge "Slightly more precise RTL check in BoringLayout.isBoring()" into mnc-dev
* commit '
021ee214c17fce863127eafad44029ff925493e8':
Jorim Jaggi [Thu, 27 Aug 2015 06:50:56 +0000 (06:50 +0000)]
am
736249d1: (-s ours) am
3cc5c24b: Merge "Fix assist for hardware long-press" into mnc-dev
* commit '
736249d1bcc93e02ed92c8054dc1b5387ad7a944':
Julia Reynolds [Thu, 27 Aug 2015 06:50:27 +0000 (06:50 +0000)]
am
22d4a8b2: (-s ours) am
279678e1: Merge "Show a default icon for permissions that lack a group." into mnc-dev
* commit '
22d4a8b2ddc15ebb8acfd21ea84b98097d1f8c09':
Jason Monk [Thu, 27 Aug 2015 06:49:56 +0000 (06:49 +0000)]
am
ddcfb5d0: (-s ours) am
58599104: Merge "Remove data icon for WFC" into mnc-dev
* commit '
ddcfb5d0a4aa25598dbee5f95d260d80f965b454':
Jason Monk [Thu, 27 Aug 2015 06:49:32 +0000 (06:49 +0000)]
am
89928030: (-s ours) am
8969817a: Merge "Fix roaming icon when not default signal" into mnc-dev
* commit '
89928030b519cb82dc6328aa52d3d31dda740582':
Amith Yamasani [Thu, 27 Aug 2015 06:49:14 +0000 (06:49 +0000)]
am
e437b1a9: (-s ours) am
5d21f416: Merge "Dispatch onUserSwitched callbacks on handler thread" into mnc-dev
* commit '
e437b1a9ff497fa650c7979149b072fb6357c25a':
Narayan Kamath [Thu, 27 Aug 2015 06:48:57 +0000 (06:48 +0000)]
am
4d51987c: (-s ours) am
f17d77cd: am
43a2aca4: Merge "Remove @ToBeFixed from knowntags."
* commit '
4d51987c19267cdf313b9381271ee0a8c0e0c154':
Christopher Tate [Thu, 27 Aug 2015 06:48:38 +0000 (06:48 +0000)]
am
14200f8a: (-s ours) am
607a040d: Merge "Add a mechanism for products to specify default active app linkages" into mnc-dev
* commit '
14200f8af2924c441803319e6937fdcf7ecd4ffb':
Alan Viverette [Thu, 27 Aug 2015 06:48:22 +0000 (06:48 +0000)]
am
18c1c358: (-s ours) am
322fd93f: Merge "Add missing break in AccessibilityEvent.eventTypeToString()" into mnc-dev
* commit '
18c1c358c5f04b6763a5d9aad6eee46605e4b32f':
Fyodor Kupolov [Thu, 27 Aug 2015 06:47:57 +0000 (06:47 +0000)]
am
ebf2ccb9: (-s ours) am
3f511882: Merge "Check location permission/appop in getScanResults" into mnc-dev
* commit '
ebf2ccb98ce4154d927d5c7e0448a512879346e3':
Robert Greenwalt [Thu, 27 Aug 2015 06:47:19 +0000 (06:47 +0000)]
am
716e95d0: (-s ours) am
b091695b: Merge "Revive NetworkInfo\'s SUSPENDED state." into mnc-dev
* commit '
716e95d06d57ec6f640c6436f6903c245d18c5b5':
Jeff Sharkey [Thu, 27 Aug 2015 06:46:39 +0000 (06:46 +0000)]
am
f09116f8: (-s ours) am
ee4a534b: Merge "Timeout when partitioning takes too long." into mnc-dev
* commit '
f09116f84ee9c11c97df479388cbfbccd8af9a17':
Jeff Sharkey [Thu, 27 Aug 2015 06:46:29 +0000 (06:46 +0000)]
am
2b748765: (-s ours) am
a419076e: Merge "Add grant flag support to "install-create" verb." into mnc-dev
* commit '
2b74876562232fcd04cf8acbc6d99b90f8284b1a':
Mikhail Naganov [Thu, 27 Aug 2015 06:46:21 +0000 (06:46 +0000)]
am
046daf12: (-s ours) am
abb8dc97: Merge "Enhance documentation of WebSettings.WebSettings method" into mnc-dev
* commit '
046daf121cee3aebfa54c21eb13ba49ccb5dd017':
Neil Fuller [Thu, 27 Aug 2015 06:46:13 +0000 (06:46 +0000)]
am
a90b9aaf: (-s ours) am
b27c379b: am
2ca4f73e: Merge "Switch LocalSocketImpl.accept() over to using Os.accept()"
* commit '
a90b9aaf56182e93ef180145d279810f7ee03d7f':
Neil Fuller [Thu, 27 Aug 2015 06:46:05 +0000 (06:46 +0000)]
am
cdb4a2c4: (-s ours) am
30d75e60: am
c83d1819: Merge "Switch from InetUnixAddress to UnixSocketAddress"
* commit '
cdb4a2c4c250bb06f0dfa494a11b8ddee2f749d7':
Kenny Guy [Thu, 27 Aug 2015 06:45:56 +0000 (06:45 +0000)]
am
937fc8d4: (-s ours) am
7d170797: Merge "Mute correct user from device policy manager." into mnc-dev
* commit '
937fc8d4dc6d27d92adf141f5dc57faa59f28034':
Narayan Kamath [Thu, 27 Aug 2015 06:45:47 +0000 (06:45 +0000)]
am
970d2a09: (-s ours) am
14b50394: Reduce overly aggressive use of narrowAm / narrowPm.
* commit '
970d2a09ded099c8f9e48f5f1fcd13ac7b4945fe':
David Friedman [Thu, 27 Aug 2015 06:45:29 +0000 (06:45 +0000)]
am
4cb773a8: (-s ours) am
8cb9fd84: am
6051cd3e: am
1809f534: Docs: Changes to the "Support" preview page.
* commit '
4cb773a8c044f68de684efc0b009f503b477168b':
Dirk Dougherty [Thu, 27 Aug 2015 06:45:02 +0000 (06:45 +0000)]
am
303dd9a2: (-s ours) am
872c2482: am
95fc4f45: am
9d5df5ca: Merge "Doc change: add x86 to emulator spec." into mnc-preview-docs
* commit '
303dd9a2d89555b556603033560081d050f139cb':
David Friedman [Thu, 27 Aug 2015 06:44:38 +0000 (06:44 +0000)]
am
49cd4eac: (-s ours) am
15d1c1c9: am
064f8b68: am
dde5e263: Merge "Docs: Fixes to the quick-view wrapper on non-English "about lollipop" pages." into mnc-preview-docs
* commit '
49cd4eac3b6af25f82ceebfe73666df4d2ddcc14':
Dirk Dougherty [Thu, 27 Aug 2015 06:44:23 +0000 (06:44 +0000)]
am
e075053b: (-s ours) am
492123d5: am
119683d1: am
0ffd7158: Merge "Doc change: minor updates to KIs and AFW behavior changes." into mnc-preview-docs
* commit '
e075053b0842c21c93a031fbeeecc6fe3882e11d':
Jim Miller [Thu, 27 Aug 2015 06:44:15 +0000 (06:44 +0000)]
am
d92f643a: (-s ours) am
748bc36f: Remove "final" qualifier from AuthenticationResult
* commit '
d92f643a726e1abcc46cfb34d7cdd7a45853b7e7':
Robert Greenwalt [Thu, 27 Aug 2015 06:44:03 +0000 (06:44 +0000)]
am
e9402b7e: (-s ours) am
348988c5: Merge "Fix permissions on TelephonyManager" into mnc-dev
* commit '
e9402b7e5bca1b0e1d2c8b7945ed67a0292a47c1':
Sanket Padawe [Thu, 27 Aug 2015 06:43:56 +0000 (06:43 +0000)]
am
bae7a4d8: (-s ours) am
58295e71: Merge "Add Null checks while processing pairing cancel intent" into mnc-dev
* commit '
bae7a4d8718eae7418b774a82a9a907a5e5a9d75':
Adam Lesinski [Thu, 27 Aug 2015 06:43:47 +0000 (06:43 +0000)]
am
0d5c30d9: (-s ours) am
7fb1655a: Merge "BatteryStats: Fail gracefully on corrupt battery stats" into mnc-dev
* commit '
0d5c30d9ba97997e0ec7bfcc1e267c90beb108c4':
Robert Greenwalt [Thu, 27 Aug 2015 06:43:34 +0000 (06:43 +0000)]
am
3f66835c: (-s ours) am
de335a7d: Merge "Fix Permission Typo." into mnc-dev
* commit '
3f66835cc1ac5c6888da24b305590b3f3600f117':
Mady Mellor [Thu, 27 Aug 2015 06:43:06 +0000 (06:43 +0000)]
am
809cdd57: (-s ours) am
84005b40: Merge "Use hint text to position handle / floating tool bar popups" into mnc-dev
* commit '
809cdd579abb8193f24a223de12f7b5c291fe757':
Svetoslav [Thu, 27 Aug 2015 06:42:27 +0000 (06:42 +0000)]
am
d98e6dc2: (-s ours) am
6638c182: Merge "Fix reset permissions on clear data and package uninstall." into mnc-dev
* commit '
d98e6dc2b0fd50a9522b6a538ed847c0c24aa3c7':
Svet Ganov [Thu, 27 Aug 2015 06:41:43 +0000 (06:41 +0000)]
am
11be2916: (-s ours) am
9b84b5c5: Merge "Update storage group icon" into mnc-dev
* commit '
11be291675b512aafd7f090646dbba11bdd63b27':
Jack Yu [Thu, 27 Aug 2015 06:41:05 +0000 (06:41 +0000)]
am
99b0a02f: (-s ours) am
6b7a0784: Merge "Grant SMS permissions to Cell Broadcast receiver which emergency/non-emergency broadcast messages from the network." into mnc-dev
* commit '
99b0a02f93ea3280f5b73b530f8d9c2d89973b24':
Amith Yamasani [Thu, 27 Aug 2015 06:40:17 +0000 (06:40 +0000)]
am
ac3fb15f: (-s ours) am
705ba960: Merge "Qualify the uid with the userId when granting permissions" into mnc-dev
* commit '
ac3fb15fb8501de4ff90923bd295679e6c473fee':
Wale Ogunwale [Thu, 27 Aug 2015 06:39:29 +0000 (06:39 +0000)]
am
6a231f48: (-s ours) am
dad62b9f: Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev
* commit '
6a231f489177ca775dd4e60eb72054812c1034f2':
Jeff Sharkey [Thu, 27 Aug 2015 06:38:38 +0000 (06:38 +0000)]
am
ddcaa330: (-s ours) am
9f4c4ee6: Merge "Fix crash looping SystemUI." into mnc-dev
* commit '
ddcaa330bd20ae2f566d25bd6776012a9921df6a':
Selim Cinek [Thu, 27 Aug 2015 06:37:56 +0000 (06:37 +0000)]
am
7ac64f1d: (-s ours) am
9201385f: Merge "Cleaned up the clipping logic for the dismiss motion." into mnc-dev
* commit '
7ac64f1d8d33ec31123fffbdb804ea406f11fd36':