OSDN Git Service
Jean-Michel Trivi [Thu, 27 Aug 2015 09:57:47 +0000 (09:57 +0000)]
am
b98166c6: (-s ours) am
fc5a4bf0: Merge "AudioService: check for audio device connection success" into mnc-dev
* commit '
b98166c642c24538e3223305f6f7454928e59e00':
John Reck [Thu, 27 Aug 2015 09:57:21 +0000 (09:57 +0000)]
am
666f3194: (-s ours) am
2fa3eec0: am
93c14069: Merge "hwui: add extension to support unpack operations in OpenGL ES 2.0"
* commit '
666f319443498cb206fd33b613361e3e1fb69b69':
Svetoslav Ganov [Thu, 27 Aug 2015 09:57:03 +0000 (09:57 +0000)]
am
b1ed7e19: (-s ours) am
ce68917c: Merge "Ensure per package and per UID state share same package settings." into mnc-dev
* commit '
b1ed7e19837ba60b70e8f98e44f83dcf372552fa':
Yohei Yukawa [Thu, 27 Aug 2015 09:56:50 +0000 (09:56 +0000)]
am
1fdac7a8: (-s ours) am
2d34a8b7: Merge "Revert "Do not forceLayout when window is resized"" into mnc-dev
* commit '
1fdac7a859416da43db49a7b65c487b53f9c5350':
Nick Kralevich [Thu, 27 Aug 2015 09:56:39 +0000 (09:56 +0000)]
am
5fa85ce6: (-s ours) am
97b68bbe: Merge "UsbDeviceManager: fix b/
21429947 regression (try #2)" into mnc-dev
* commit '
5fa85ce6f818f97d5c60b8ccdfe84b337fb3f732':
John Reck [Thu, 27 Aug 2015 09:56:24 +0000 (09:56 +0000)]
am
5fe0aac6: (-s ours) am
70e5db94: Merge "Fix crash in kModeProcessNoContext" into mnc-dev
* commit '
5fe0aac688cc68385ebcc60078c48d2c1694ce79':
Julia Reynolds [Thu, 27 Aug 2015 09:56:13 +0000 (09:56 +0000)]
am
c530e778: (-s ours) am
35a1a209: Merge "Include dnd status in bugreports." into mnc-dev
* commit '
c530e77831b3cf1b5dfaa03cb06f812160941fb3':
Matthew Williams [Thu, 27 Aug 2015 09:56:01 +0000 (09:56 +0000)]
am
0a4af7ad: (-s ours) am
d6ef2313: am
0c53f72e: Merge "Fix NPE in JobStore when jobs.xml is empty."
* commit '
0a4af7adebe4230e7c258b5e35f953db0ffe1f40':
Matthew Williams [Thu, 27 Aug 2015 09:55:38 +0000 (09:55 +0000)]
am
7d4c58f7: (-s ours) am
fad3c663: Merge "Remove spurious syncmanager wake-ups" into mnc-dev
* commit '
7d4c58f7267138cdbf650510389330dd45803d2d':
Ian Pedowitz [Thu, 27 Aug 2015 09:55:18 +0000 (09:55 +0000)]
am
93919ff1: (-s ours) am
845d14db: Revert "Permissions: GET_ACCOUNTS permission cleanup"
* commit '
93919ff1fc9be98a4f314cd2600960d1ef5c207c':
Wale Ogunwale [Thu, 27 Aug 2015 09:54:49 +0000 (09:54 +0000)]
am
9fdff2e5: (-s ours) am
b2690f38: Merge "Fail silently if a process trys to launch an acitvity for background user" into mnc-dev
* commit '
9fdff2e5431d20429ec47f760a5cf1ef5fc5eafc':
Jason Monk [Thu, 27 Aug 2015 09:54:08 +0000 (09:54 +0000)]
am
26085a0a: (-s ours) am
55dbf2d7: Merge "QS: Allow Flashlight Tile to handle reset state" into mnc-dev
* commit '
26085a0aac218a255298d682f5f7a0df9c7de261':
Pavlin Radoslavov [Thu, 27 Aug 2015 09:53:42 +0000 (09:53 +0000)]
am
040e5771: (-s ours) am
29b8c4ab: Reset the pointer to the Bluetooth GATT service
* commit '
040e5771c14e0880c4a39d761eb897fcb3071c7d':
Adam Lesinski [Thu, 27 Aug 2015 09:53:18 +0000 (09:53 +0000)]
am
e8585a23: (-s ours) am
59d72c86: Merge "BatteryStats: Add debug logging to find source of b/
22716723" into mnc-dev
* commit '
e8585a23de53cb98ca0a8999ab9f685bc279ac16':
Dianne Hackborn [Thu, 27 Aug 2015 09:52:58 +0000 (09:52 +0000)]
am
6835ef09: (-s ours) am
d9b0f843: Merge "Fix issue #
22860466: viapi security bug - rubber stamping in nested VIs" into mnc-dev
* commit '
6835ef095acdfbab93a939e0164beb3a0c925708':
Prem Kumar [Thu, 27 Aug 2015 09:52:44 +0000 (09:52 +0000)]
am
7fdd006d: (-s ours) am
04e2cf6b: Merge "Make default selection for contact sharing to "Checked"." into mnc-dev
* commit '
7fdd006d2a0b31ac39a0444045ebb43023b81f14':
Wale Ogunwale [Thu, 27 Aug 2015 09:52:32 +0000 (09:52 +0000)]
am
97eb60a6: (-s ours) am
911bd0d3: Merge "Set broadcast nextReceiver correctly when package is disabled" into mnc-dev
* commit '
97eb60a68e555336a30c138aee23a18c5a0498d7':
John Reck [Thu, 27 Aug 2015 09:52:17 +0000 (09:52 +0000)]
am
5d0c84bd: (-s ours) am
c03ab87a: Merge "Disable skipping frames on empty damage" into mnc-dev
* commit '
5d0c84bd7f793d5ecb6d6c446f978fa8ee9a2493':
Svetoslav Ganov [Thu, 27 Aug 2015 09:51:52 +0000 (09:51 +0000)]
am
b2972dbd: (-s ours) am
ac8c9861: Merge "Notify settings URI change without a lock held" into mnc-dev
* commit '
b2972dbd75fa6c401405ae21a61bdd0df6b91cf4':
Dianne Hackborn [Thu, 27 Aug 2015 09:51:25 +0000 (09:51 +0000)]
am
a7b80741: (-s ours) am
3011f645: Merge "Fix issue #
22912704: "android.process.acore has stopped" dialog keeps popping up" into mnc-dev
* commit '
a7b8074191e6ab50184691df9cfeb96034717b4d':
John Reck [Thu, 27 Aug 2015 09:51:00 +0000 (09:51 +0000)]
am
10fdfb18: (-s ours) am
7290d93d: Merge "Yell loudly about undefined behind in Bitmap, but work anyway" into mnc-dev
* commit '
10fdfb18152d9b7e0f1757c503e9829e40d3eeee':
Jeff Sharkey [Thu, 27 Aug 2015 09:50:40 +0000 (09:50 +0000)]
am
275d41d0: (-s ours) am
0faca96f: Merge "Avoid deadlock by broadcasting outside lock." into mnc-dev
* commit '
275d41d0a19b9be702f8512fc87e1817525c7475':
Matthew Williams [Thu, 27 Aug 2015 09:50:27 +0000 (09:50 +0000)]
am
d13667e3: (-s ours) am
b3448bf1: am
608ad140: Merge "Idle Job Start During SCREEN_ON or DREAMING_STOPPED"
* commit '
d13667e31dc0189b477fede4963b7c1f8379f3c2':
Diego Perez [Thu, 27 Aug 2015 09:50:16 +0000 (09:50 +0000)]
am
16a1c9e1: (-s ours) am
405eceb2: Merge "Restore session params "no decoration" flag" into mnc-dev
* commit '
16a1c9e19b67bfd75b7d8b6d00d7cf22e1ab4615':
Deepanshu Gupta [Thu, 27 Aug 2015 09:50:05 +0000 (09:50 +0000)]
am
fecb60f1: (-s ours) am
d985e3b6: Merge changes Ib5f53f3b,I7debf3ee,Ic494ee7f,Ia8d223ae,Iff7dbbf6 into mnc-dev
* commit '
fecb60f1a7f449ac99d4fe047bcc0bf9dbb48950':
Jeff Sharkey [Thu, 27 Aug 2015 09:49:53 +0000 (09:49 +0000)]
am
e2faac0a: (-s ours) am
3ba2bfa7: Merge "Expand ringtone titles to support OGG and FLAC." into mnc-dev
* commit '
e2faac0a13081d4342e0c75c33abfa253290acdf':
Wale Ogunwale [Thu, 27 Aug 2015 09:49:38 +0000 (09:49 +0000)]
am
2031adff: (-s ours) am
f8576979: Merge "Also consider task intent when trimming recent tasks" into mnc-dev
* commit '
2031adffb8936dcb8d8f9c8b4668cd2ae50d44b8':
Alan Viverette [Thu, 27 Aug 2015 09:49:24 +0000 (09:49 +0000)]
am
183aa948: (-s ours) am
7b4170fa: Merge "Update Material link text to be colorAccent" into mnc-dev
* commit '
183aa948be9f8b5169ea4281421c8ee90d2634b7':
Jim Miller [Thu, 27 Aug 2015 09:49:11 +0000 (09:49 +0000)]
am
cd1e7f7b: (-s ours) am
45fcaa54: Merge "Don\'t wipe device because of short PIN, patterns or passwords" into mnc-dev
* commit '
cd1e7f7b9446413f073f35fa9dd3c944811f3e6a':
Alan Viverette [Thu, 27 Aug 2015 09:48:53 +0000 (09:48 +0000)]
am
5be6cc6d: (-s ours) am
ef3f58e5: Merge "Make ResolverDrawerLayout look like a ScrollView to accessibility" into mnc-dev
* commit '
5be6cc6db941ce5756743191366f2a8b9c2e3b2f':
Alan Viverette [Thu, 27 Aug 2015 09:48:41 +0000 (09:48 +0000)]
am
7b77b284: (-s ours) am
e76bf46a: Merge "Add badge content description to TargetInfo, use in ResolverActivity" into mnc-dev
* commit '
7b77b284dece5d3049c1fe8d826a5172485c9b28':
Billy Lau [Thu, 27 Aug 2015 09:48:28 +0000 (09:48 +0000)]
am
82330790: (-s ours) am
5680f9f6: Merge "Bug:
22879202 App compatibility with WRITE_SETTINGS failing" into mnc-dev
* commit '
82330790940a640e8a5c03bcb02a8ee7c8212174':
Svetoslav Ganov [Thu, 27 Aug 2015 09:48:15 +0000 (09:48 +0000)]
am
051a70e1: (-s ours) am
87920455: Merge "Fix NPE in AppOpsService" into mnc-dev
* commit '
051a70e1643c42523c5d80efd897f67700c17281':
Svetoslav Ganov [Thu, 27 Aug 2015 09:48:03 +0000 (09:48 +0000)]
am
aec40925: (-s ours) am
0855357c: Merge "User correct category for finding headless sync adapters" into mnc-dev
* commit '
aec40925b5cb00bd243bdf3e4707fb9bad39fd98':
Lajos Molnar [Thu, 27 Aug 2015 09:47:51 +0000 (09:47 +0000)]
am
a0426ee2: (-s ours) am
0ca1e98f: Merge "media: Clarify MediaCodec and CodecCapabilities documentation" into mnc-dev
* commit '
a0426ee22ffbfdac7ee25815516c9d22631767e2':
Todd Kennedy [Thu, 27 Aug 2015 09:47:40 +0000 (09:47 +0000)]
am
9f485905: (-s ours) am
772c6c0d: am
40f0efe0: Merge "Add a trace constant for PackageManager"
* commit '
9f48590554979f137bac7505a146508d168eed7f':
Ruben Brunk [Thu, 27 Aug 2015 09:47:30 +0000 (09:47 +0000)]
am
7cf5a0f6: (-s ours) am
7469060e: Merge "Make vendor keys visible in Camera2 java APIs." into mnc-dev
* commit '
7cf5a0f698a4c0ad109581fb4c6087c740976226':
Jason Monk [Thu, 27 Aug 2015 09:47:18 +0000 (09:47 +0000)]
am
93053a8e: (-s ours) am
66845a36: Add more dump info about emergency calls state
* commit '
93053a8e1991b5a47c5f99961554704aae172005':
Svetoslav Ganov [Thu, 27 Aug 2015 09:47:06 +0000 (09:47 +0000)]
am
52f805e4: (-s ours) am
8dbd4848: Merge "Add per UID control to app ops." into mnc-dev
* commit '
52f805e4b1a076e5d205822e3c6ab33609b5e163':
Jan Nordqvist [Thu, 27 Aug 2015 09:46:50 +0000 (09:46 +0000)]
am
12836594: (-s ours) am
cb9c0940: Merge "Added logging in a few error paths for wifi config installation." into mnc-dev
* commit '
128365943a089dcf03e082e9f64024d119a9e6dc':
Chris Wren [Thu, 27 Aug 2015 09:46:32 +0000 (09:46 +0000)]
am
6fe94248: (-s ours) am
6e75e7dd: Merge "Instrument printing service for metrics collection." into mnc-dev
* commit '
6fe94248373da7aeb3386c40ca0c6ce441b676a9':
Selim Cinek [Thu, 27 Aug 2015 09:46:12 +0000 (09:46 +0000)]
am
54f9a21a: (-s ours) am
f92a1fdb: Fixed a bug where notifications shadows were blinking out
* commit '
54f9a21a440d16c63668b82796febaf990d7a82f':
Yusuke Sato [Thu, 27 Aug 2015 09:45:48 +0000 (09:45 +0000)]
am
c2369c53: (-s ours) am
b98e2353: am
158560ad: Merge "Distinguish user-requested shutdown from power-related ones"
* commit '
c2369c5301c489195daa25894ea838cfa7f2a661':
Filip Gruszczynski [Thu, 27 Aug 2015 09:45:33 +0000 (09:45 +0000)]
am
ce09247b: (-s ours) am
00ab3578: Merge "Make enter reveal animation be zorder top." into mnc-dev
* commit '
ce09247b6f5dfbf64f3e5e0a7f1a374e64583620':
Dianne Hackborn [Thu, 27 Aug 2015 09:45:23 +0000 (09:45 +0000)]
am
e3047ddc: (-s ours) am
fb68b0ad: Merge "Fix issue #
21895842: Add is_assist_blocked to assist.ViewNode.NodeProperties" into mnc-dev
* commit '
e3047ddcceeed9c0c54775ef916529526db1bcea':
Jean-Michel Trivi [Thu, 27 Aug 2015 09:45:13 +0000 (09:45 +0000)]
am
c5827cec: (-s ours) am
ffbdb8ad: Merge "Fix that shutter sound does not play after ringer mode changes to vibrator" into mnc-dev
* commit '
c5827cec8e29a6031ec5092f94e2b67bda1117bc':
Alan Viverette [Thu, 27 Aug 2015 09:45:05 +0000 (09:45 +0000)]
am
51a8fe95: (-s ours) am
5cca30a4: Merge "Revert two changes to LinearLayout measurement" into mnc-dev
* commit '
51a8fe950efb67e23b7bb64719322c0a7b415367':
Alan Viverette [Thu, 27 Aug 2015 09:44:56 +0000 (09:44 +0000)]
am
d4c8f2a5: (-s ours) am
9d8a230f: Revert "View measurement optimization"
* commit '
d4c8f2a5e632df2c07587d5717eb017e9f459389':
Winson Chung [Thu, 27 Aug 2015 09:44:48 +0000 (09:44 +0000)]
am
7a8f112c: (-s ours) am
c35e670d: Moving removeTask to separate thread.
* commit '
7a8f112c4c23b5d9b2208717e4430150f70e6cbb':
Winson Chung [Thu, 27 Aug 2015 09:44:39 +0000 (09:44 +0000)]
am
e335de61: (-s ours) am
92e0c86f: Merge "Ensuring that we don\'t try to use and propagate null activity labels." into mnc-dev
* commit '
e335de61772d2ec0475d7a064e325d49f37be356':
Deepanshu Gupta [Thu, 27 Aug 2015 09:44:29 +0000 (09:44 +0000)]
Wale Ogunwale [Thu, 27 Aug 2015 09:44:16 +0000 (09:44 +0000)]
am
c274a207: (-s ours) am
f7e00dbd: Merge "Fixed issue with artifacts during scale-up transition animation" into mnc-dev
* commit '
c274a20763806d6e0313294a0fa55fe65ab5af49':
Dianne Hackborn [Thu, 27 Aug 2015 09:43:57 +0000 (09:43 +0000)]
am
b1dc3441: (-s ours) am
ebbc891a: Merge "Fix build." into mnc-dev
* commit '
b1dc3441668e7ffc0c0080b8bd02711bdd55eec5':
Glenn Kasten [Thu, 27 Aug 2015 09:43:40 +0000 (09:43 +0000)]
am
30981ed5: (-s ours) am
37f559be: Merge "Improve getTimestamp documentation" into mnc-dev
* commit '
30981ed54fe3d0d926f236d97e101811fb40bb7c':
Dianne Hackborn [Thu, 27 Aug 2015 09:43:24 +0000 (09:43 +0000)]
Dianne Hackborn [Thu, 27 Aug 2015 09:43:12 +0000 (09:43 +0000)]
am
c14e670c: (-s ours) am
c1836bb0: Merge "Change MNC codename to just M." into mnc-dev
* commit '
c14e670c49f85710b858ef96fdc9341b6a7dc340':
Dianne Hackborn [Thu, 27 Aug 2015 09:43:00 +0000 (09:43 +0000)]
am
f2269f04: (-s ours) Change MNC codename to just M.
* commit '
f2269f0454bd57d012c5df37e9b88023c2d924f2':
Change MNC codename to just M.
Tyler Gunn [Thu, 27 Aug 2015 09:42:50 +0000 (09:42 +0000)]
am
384fc141: (-s ours) am
d0694da4: Merge "Add telecom extra keys required for DMR release." into mnc-dev
* commit '
384fc14102dad21dd9875b8dccb2b2bfa5bc25a2':
Julia Reynolds [Thu, 27 Aug 2015 09:42:41 +0000 (09:42 +0000)]
am
77978934: (-s ours) am
5d6a2d38: Merge "Fix SysUI crash on device boot." into mnc-dev
* commit '
77978934c769cc2c9e487621d5475ebe625b39ab':
Rubin Xu [Thu, 27 Aug 2015 09:42:32 +0000 (09:42 +0000)]
am
19f7007b: (-s ours) am
9a81a182: Merge "Don\'t always transfer device owner status to other users." into mnc-dev
* commit '
19f7007bc349481a0796fb86359d930f7057c539':
Benjamin Franz [Thu, 27 Aug 2015 09:42:24 +0000 (09:42 +0000)]
am
eb83e998: (-s ours) am
d692fcf1: Merge "Add missing return statement" into mnc-dev
* commit '
eb83e998dc021ec7716c91d2bb376e201943d38a':
Lorenzo Colitti [Thu, 27 Aug 2015 09:42:12 +0000 (09:42 +0000)]
am
be265a2b: (-s ours) am
496a9d26: Merge "Stop supporting legacy ConnectivityManager routing methods in M." into mnc-dev
* commit '
be265a2b440a959d8f89775499dfaaea8f6fa8e0':
Dave Langemak [Thu, 27 Aug 2015 09:41:58 +0000 (09:41 +0000)]
am
4f3b189e: (-s ours) am
02565c36: Merge changes from topic \'fix-notification-inflation-2\' into mnc-dev
* commit '
4f3b189e9b029ac68222ef5b9b6e28e8e4d4f2a8':
Hung-ying Tyan [Thu, 27 Aug 2015 09:41:38 +0000 (09:41 +0000)]
am
8be74fae: (-s ours) am
410abcdb: Merge "Revise lockdown check in getLegacyVpnInfo()" into mnc-dev
* commit '
8be74faef90625e429b3e3578a5357d5c7e3f757':
Geoff Mendal [Thu, 27 Aug 2015 09:41:11 +0000 (09:41 +0000)]
am
c8dcee0f: (-s ours) am
bbb47d88: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
c8dcee0fa8cede4fec399235f40eb76b41f01a6c':
Ronghua Wu [Thu, 27 Aug 2015 09:40:39 +0000 (09:40 +0000)]
am
db29b894: (-s ours) am
e8b7febd: Merge "media: use blocks number to find closest size" into mnc-dev
* commit '
db29b8943d2a7f3591b702315974ef10ebfde2fd':
Jeff Sharkey [Thu, 27 Aug 2015 09:40:07 +0000 (09:40 +0000)]
am
1ff0d50c: (-s ours) am
5db4cc8f: Merge "Handle volumes without visible paths." into mnc-dev
* commit '
1ff0d50cd87bff245325d9858c5df710ab238465':
Adam Lesinski [Thu, 27 Aug 2015 09:39:40 +0000 (09:39 +0000)]
am
10730b69: (-s ours) am
e3b0119f: Merge "AAPT: Fix resource versioning" into mnc-dev
* commit '
10730b690732e3301048a0a564c3e5b42f28995d':
Selim Cinek [Thu, 27 Aug 2015 09:39:14 +0000 (09:39 +0000)]
am
c0d9c0c1: (-s ours) am
b9f30b26: Merge "The heads up now correctly dissapears when clicking" into mnc-dev
* commit '
c0d9c0c13e2444a55828625b865e4becc33d60fc':
Amit Mahajan [Thu, 27 Aug 2015 09:38:56 +0000 (09:38 +0000)]
am
8ca5a84a: (-s ours) am
53c75014: Merge "Add OrSelf to privileged permission check." into mnc-dev
* commit '
8ca5a84a457463c14b4d2752000d59844e211ac8':
Adam Lesinski [Thu, 27 Aug 2015 09:38:43 +0000 (09:38 +0000)]
am
1c023b5a: (-s ours) am
00f7cb92: Merge "BatteryStats: include mobile radio active count and unknown time in checkin" into mnc-dev
* commit '
1c023b5aac6626ac1133a7c10b759bcd807f1a18':
Andre Eisenbach [Thu, 27 Aug 2015 09:38:29 +0000 (09:38 +0000)]
am
4a622aa9: (-s ours) am
3bf1ac54: Bluetooth: Don\'t call beginBroadcast() while in a broadcast
* commit '
4a622aa937165b58b29d3e88470109d25f09eb23':
Carlos Valdivia [Thu, 27 Aug 2015 09:38:14 +0000 (09:38 +0000)]
am
b9441edd: (-s ours) am
26ae600b: Merge "Permissions: GET_ACCOUNTS permission cleanup" into mnc-dev
* commit '
b9441edd6a11c05d7bd8c865351d316b99954c40':
Deepanshu Gupta [Thu, 27 Aug 2015 09:37:50 +0000 (09:37 +0000)]
am
a1e1d142: (-s ours) am
7676e403: Merge changes I4c215676,Ib476302c,I0aede288,I9241dec7,Ibe7167a6, ... into mnc-dev
* commit '
a1e1d1427f55493e028bf11910ec99a4581b2a19':
Selim Cinek [Thu, 27 Aug 2015 09:37:13 +0000 (09:37 +0000)]
am
758a28d4: (-s ours) am
20a5d331: Merge "Fixed a heads up crash" into mnc-dev
* commit '
758a28d4a15de87f599e074e2b6c7404907b1be1':
Phil Burk [Thu, 27 Aug 2015 09:36:41 +0000 (09:36 +0000)]
am
65e6e984: (-s ours) am
8f5228af: Merge "UsbMidiDevice: add timestamps for input events" into mnc-dev
* commit '
65e6e984a74824184da7c79e58467f504c471b0b':
Phil Burk [Thu, 27 Aug 2015 09:36:01 +0000 (09:36 +0000)]
am
1742d926: (-s ours) am
2f1a08e6: Merge "MIDI docs BTLE: how to open BTLE MIDI devices" into mnc-dev
* commit '
1742d9261d28dea39d2cd9e7a53dbb9a33a02eb1':
Phil Burk [Thu, 27 Aug 2015 09:35:32 +0000 (09:35 +0000)]
am
f6615376: (-s ours) am
fdcd8216: Merge "MIDI package doc: add hasSystemFeature() call" into mnc-dev
* commit '
f66153764001b2fe29eefed7aadd2257e81fedea':
Phil Burk [Thu, 27 Aug 2015 09:35:06 +0000 (09:35 +0000)]
am
0f1014ae: (-s ours) am
559a2420: Merge "MidiDevice: document that opens can return nulls" into mnc-dev
* commit '
0f1014aee12494c30c1e98d38ca88e0646c289a6':
Fyodor Kupolov [Thu, 27 Aug 2015 09:34:52 +0000 (09:34 +0000)]
am
123a9f93: (-s ours) am
4988378c: Merge "Introduced android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev
* commit '
123a9f93adfce2f463fafd24cd4200ea2fc3cb95':
Shawn Willden [Thu, 27 Aug 2015 09:34:39 +0000 (09:34 +0000)]
am
3d4b9655: (-s ours) am
75e51ec0: Merge "Raw RSA Cipher relies on keymaster for padding and range checks." into mnc-dev
* commit '
3d4b9655e2e0bef663a4da5b714f0b63155c79c4':
Chris Craik [Thu, 27 Aug 2015 09:34:23 +0000 (09:34 +0000)]
am
dd497cab: (-s ours) am
730c0f65: Merge "Fix stencil mask usage in HWUI" into mnc-dev
* commit '
dd497cab351b8998753868b96936431496895774':
Shishir Agrawal [Thu, 27 Aug 2015 09:33:54 +0000 (09:33 +0000)]
am
e43beb5d: (-s ours) am
8d1d8fda: Merge "Add SMS permissions for Carrier app." into mnc-dev
* commit '
e43beb5dc0ad40f5f54a1818839f7276ef4f4924':
Chris Tate [Thu, 27 Aug 2015 09:33:28 +0000 (09:33 +0000)]
am
ba0d1eef: (-s ours) am
74a0744e: Merge "Fix issues around process teardown after full-data restore" into mnc-dev
* commit '
ba0d1eefc08796a55e37d6244020dafe406025e5':
Simranjit Kohli [Thu, 27 Aug 2015 09:33:07 +0000 (09:33 +0000)]
am
826d5aca: (-s ours) am
964a4121: Merge "[Improve docs for AccountManager] Currently, the docs for AccountManager are somewhat misleading and may cause developer errors. To avoid them, we are properly documenting it." into mnc-dev
* commit '
826d5acab18ba1894ef228776b9321d43cf76cd7':
Alan Viverette [Thu, 27 Aug 2015 09:32:50 +0000 (09:32 +0000)]
am
ca5fb5c3: (-s ours) am
559daf7a: Merge "Include non-zero dimension views in excess space calculation" into mnc-dev
* commit '
ca5fb5c32c4ac06eb676111f84aec7a689fb8644':
Dan Sandler [Thu, 27 Aug 2015 09:32:38 +0000 (09:32 +0000)]
am
b18c2c42: (-s ours) am
7bd8e6a8: DateTimeView: don\'t assume you have an ApplicationContext.
* commit '
b18c2c4276954bad9080c429c19fcefbab21078d':
Alan Viverette [Thu, 27 Aug 2015 09:32:26 +0000 (09:32 +0000)]
am
a83fb6f6: (-s ours) am
c1d5b6c1: Merge "Move padding from navigation and overflow icons to Toolbar" into mnc-dev
* commit '
a83fb6f6dfed44343a79b7b57e6f8be7ef4788ce':
Elliott Hughes [Thu, 27 Aug 2015 09:32:15 +0000 (09:32 +0000)]
am
d065fd41: (-s ours) am
204b4157: am
f8a6a2f6: Merge "Use _WIN32 rather than HAVE_WINSOCK."
* commit '
d065fd415cf02c25dd80a01a12fbafb0b20cd08b':
Jim Miller [Thu, 27 Aug 2015 09:32:02 +0000 (09:32 +0000)]
am
0c152b9e: (-s ours) am
30c5da9c: Don\'t call cancel() when fingerprint auth fails
* commit '
0c152b9e8424bdcbf558391ad40d2ca4fea9f62a':
Daniel Sandler [Thu, 27 Aug 2015 09:31:50 +0000 (09:31 +0000)]
am
b10d22ff: (-s ours) am
bbe1682b: Merge changes from topic \'fix-media-notifications\' into mnc-dev
* commit '
b10d22ff93dfdba2077e5aaa2e3948015056849d':
Paul Jensen [Thu, 27 Aug 2015 09:31:36 +0000 (09:31 +0000)]
am
d732799a: (-s ours) am
a991c66c: Merge "Fix missing onLost NetworkCallbacks when network loses capability" into mnc-dev
* commit '
d732799abb7f2bf82e3e21d4b10ee31e9d4ca3ea':
Dianne Hackborn [Thu, 27 Aug 2015 09:31:21 +0000 (09:31 +0000)]
am
98169db3: (-s ours) am
8d3a67a8: Merge "More maybe fix issue #
22765972: Binder transactions running out..." into mnc-dev
* commit '
98169db36bd676ce1a10478c4851c918414e6c14':
Jason Monk [Thu, 27 Aug 2015 09:31:03 +0000 (09:31 +0000)]
am
710091b1: (-s ours) am
beb3185f: Merge "Fix touch target for settings icon" into mnc-dev
* commit '
710091b125c2bd996c26d26aaf12472335b72b1c':
Jorim Jaggi [Thu, 27 Aug 2015 09:30:47 +0000 (09:30 +0000)]
am
e987d609: (-s ours) am
26aa04c3: Fix state weirdness in the panel
* commit '
e987d6099b43c305d2ee49b1160a31fd7cf609c2':
Elliott Hughes [Thu, 27 Aug 2015 09:30:26 +0000 (09:30 +0000)]
am
e6286724: (-s ours) am
e528f048: am
84a04d52: Merge "Move frameworks/base/tools/ off AndroidConfig.h."
* commit '
e62867247d9386472c0b19662763c731312491cf':
Jorim Jaggi [Thu, 27 Aug 2015 09:30:13 +0000 (09:30 +0000)]
Wale Ogunwale [Thu, 27 Aug 2015 09:30:00 +0000 (09:30 +0000)]
am
96a10552: (-s ours) am
e8246ff7: Merge "Fixed out of bounds exception while handling app crash" into mnc-dev
* commit '
96a105522e3f6c0495123904bb5ae058a190c987':
Jorim Jaggi [Thu, 27 Aug 2015 09:29:47 +0000 (09:29 +0000)]
am
36a2759f: (-s ours) am
4a0e791c: Workaround View.post issues to fix runtime crash
* commit '
36a2759f1806ed03612e8f4a41b18d15cc4a27c3':
Billy Lau [Thu, 27 Aug 2015 09:29:35 +0000 (09:29 +0000)]
am
77bb8143: (-s ours) am
a6706627: Merge "Bug:
21589105 Rescope WRITE_SETTINGS permission (framework services perm check changes)" into mnc-dev
* commit '
77bb814318e9ca89b7b614497deae72c64e39718':
OSDN Git Service
