OSDN Git Service
Svetoslav Ganov [Thu, 27 Aug 2015 19:25:49 +0000 (19:25 +0000)]
am
d55d046d: am
b1ed7e19: (-s ours) am
ce68917c: Merge "Ensure per package and per UID state share same package settings." into mnc-dev
* commit '
d55d046df7f900541077a73e803e581c88c97aef':
Yohei Yukawa [Thu, 27 Aug 2015 19:25:38 +0000 (19:25 +0000)]
am
babe9bd0: am
1fdac7a8: (-s ours) am
2d34a8b7: Merge "Revert "Do not forceLayout when window is resized"" into mnc-dev
* commit '
babe9bd0ecfe198c1df4ff054352215674a423c4':
Nick Kralevich [Thu, 27 Aug 2015 19:25:28 +0000 (19:25 +0000)]
am
09097c1f: am
5fa85ce6: (-s ours) am
97b68bbe: Merge "UsbDeviceManager: fix b/
21429947 regression (try #2)" into mnc-dev
* commit '
09097c1fbca902d72d0b52da7c494c07d38e7515':
John Reck [Thu, 27 Aug 2015 19:25:18 +0000 (19:25 +0000)]
am
00d032aa: am
5fe0aac6: (-s ours) am
70e5db94: Merge "Fix crash in kModeProcessNoContext" into mnc-dev
* commit '
00d032aa9745b9f52282b6dfdf3555ba8887dbf0':
Julia Reynolds [Thu, 27 Aug 2015 19:25:06 +0000 (19:25 +0000)]
am
01bd318f: am
c530e778: (-s ours) am
35a1a209: Merge "Include dnd status in bugreports." into mnc-dev
* commit '
01bd318f53d252950438d25bafa5588b29babeb8':
Matthew Williams [Thu, 27 Aug 2015 19:24:44 +0000 (19:24 +0000)]
am
32f1326a: am
0a4af7ad: (-s ours) am
d6ef2313: am
0c53f72e: Merge "Fix NPE in JobStore when jobs.xml is empty."
* commit '
32f1326ad7993e122ce27c974a5e5587700ce07f':
Matthew Williams [Thu, 27 Aug 2015 19:24:23 +0000 (19:24 +0000)]
am
338e3726: am
7d4c58f7: (-s ours) am
fad3c663: Merge "Remove spurious syncmanager wake-ups" into mnc-dev
* commit '
338e3726cb63eb88eae88632238759dfcd33498b':
Ian Pedowitz [Thu, 27 Aug 2015 19:24:02 +0000 (19:24 +0000)]
am
1a33f55c: am
93919ff1: (-s ours) am
845d14db: Revert "Permissions: GET_ACCOUNTS permission cleanup"
* commit '
1a33f55c4241e753265073b370977fd24f7366d6':
Wale Ogunwale [Thu, 27 Aug 2015 19:23:46 +0000 (19:23 +0000)]
am
7fc941e4: am
9fdff2e5: (-s ours) am
b2690f38: Merge "Fail silently if a process trys to launch an acitvity for background user" into mnc-dev
* commit '
7fc941e4140027b095fdde3c1d8c8efd3e513c01':
Jason Monk [Thu, 27 Aug 2015 19:23:31 +0000 (19:23 +0000)]
am
295d442a: am
26085a0a: (-s ours) am
55dbf2d7: Merge "QS: Allow Flashlight Tile to handle reset state" into mnc-dev
* commit '
295d442a5225267b934e0fba3770323b0988fd23':
Pavlin Radoslavov [Thu, 27 Aug 2015 19:23:22 +0000 (19:23 +0000)]
am
4e7d0f2d: am
040e5771: (-s ours) am
29b8c4ab: Reset the pointer to the Bluetooth GATT service
* commit '
4e7d0f2dfe026b598b421416e919066ae603a647':
Adam Lesinski [Thu, 27 Aug 2015 19:23:14 +0000 (19:23 +0000)]
am
58ab11e5: am
e8585a23: (-s ours) am
59d72c86: Merge "BatteryStats: Add debug logging to find source of b/
22716723" into mnc-dev
* commit '
58ab11e55dd76e7f947e0bbe669214f8bc3aa1df':
Dianne Hackborn [Thu, 27 Aug 2015 19:23:06 +0000 (19:23 +0000)]
am
004a0943: am
6835ef09: (-s ours) am
d9b0f843: Merge "Fix issue #
22860466: viapi security bug - rubber stamping in nested VIs" into mnc-dev
* commit '
004a0943c1707eab4196453f58fb8a70a2b390c7':
Prem Kumar [Thu, 27 Aug 2015 19:22:59 +0000 (19:22 +0000)]
am
78bd8a71: am
7fdd006d: (-s ours) am
04e2cf6b: Merge "Make default selection for contact sharing to "Checked"." into mnc-dev
* commit '
78bd8a711999c542354f9b2a98cf6670acd5446f':
Wale Ogunwale [Thu, 27 Aug 2015 19:22:50 +0000 (19:22 +0000)]
am
e0564e1d: am
97eb60a6: (-s ours) am
911bd0d3: Merge "Set broadcast nextReceiver correctly when package is disabled" into mnc-dev
* commit '
e0564e1dce80c66d5d310a4f0c884348a55656e9':
John Reck [Thu, 27 Aug 2015 19:22:42 +0000 (19:22 +0000)]
am
2a435876: am
5d0c84bd: (-s ours) am
c03ab87a: Merge "Disable skipping frames on empty damage" into mnc-dev
* commit '
2a435876e793cf85b5f65521170f76345e84bbe7':
Svetoslav Ganov [Thu, 27 Aug 2015 19:22:35 +0000 (19:22 +0000)]
am
76c02707: am
b2972dbd: (-s ours) am
ac8c9861: Merge "Notify settings URI change without a lock held" into mnc-dev
* commit '
76c02707252f53878a89dfa6bbba736ecf64e9e3':
Dianne Hackborn [Thu, 27 Aug 2015 19:22:27 +0000 (19:22 +0000)]
am
d45d8cb6: am
a7b80741: (-s ours) am
3011f645: Merge "Fix issue #
22912704: "android.process.acore has stopped" dialog keeps popping up" into mnc-dev
* commit '
d45d8cb6e7204d0e0775fa54f0efaf5c1a33bbde':
John Reck [Thu, 27 Aug 2015 19:22:15 +0000 (19:22 +0000)]
am
57d10247: am
10fdfb18: (-s ours) am
7290d93d: Merge "Yell loudly about undefined behind in Bitmap, but work anyway" into mnc-dev
* commit '
57d102478039a1330a67c6d3d04f16e7e1ba1377':
Jeff Sharkey [Thu, 27 Aug 2015 19:22:03 +0000 (19:22 +0000)]
am
f2972a77: am
275d41d0: (-s ours) am
0faca96f: Merge "Avoid deadlock by broadcasting outside lock." into mnc-dev
* commit '
f2972a77ea6cdfe6d80dd73535bb116e0479f752':
Matthew Williams [Thu, 27 Aug 2015 19:21:47 +0000 (19:21 +0000)]
am
61dbcca8: am
d13667e3: (-s ours) am
b3448bf1: am
608ad140: Merge "Idle Job Start During SCREEN_ON or DREAMING_STOPPED"
* commit '
61dbcca84314e790801b4575818a6bdf5469128c':
Diego Perez [Thu, 27 Aug 2015 19:21:31 +0000 (19:21 +0000)]
am
5ee7a365: am
16a1c9e1: (-s ours) am
405eceb2: Merge "Restore session params "no decoration" flag" into mnc-dev
* commit '
5ee7a3659edf1bd04cd1eaeef01b74c9f98c28fb':
Deepanshu Gupta [Thu, 27 Aug 2015 19:21:17 +0000 (19:21 +0000)]
am
f77a645c: am
fecb60f1: (-s ours) am
d985e3b6: Merge changes Ib5f53f3b,I7debf3ee,Ic494ee7f,Ia8d223ae,Iff7dbbf6 into mnc-dev
* commit '
f77a645cce74f97627d4afd7575f7f96829bbeea':
Jeff Sharkey [Thu, 27 Aug 2015 19:21:05 +0000 (19:21 +0000)]
am
a9525da9: am
e2faac0a: (-s ours) am
3ba2bfa7: Merge "Expand ringtone titles to support OGG and FLAC." into mnc-dev
* commit '
a9525da9c1c5f05297e3adb497bf9a11f2d2ca77':
Wale Ogunwale [Thu, 27 Aug 2015 19:20:55 +0000 (19:20 +0000)]
am
cb6c1663: am
2031adff: (-s ours) am
f8576979: Merge "Also consider task intent when trimming recent tasks" into mnc-dev
* commit '
cb6c1663276621f3858881e51a83fd8e6bcb754e':
Alan Viverette [Thu, 27 Aug 2015 19:20:45 +0000 (19:20 +0000)]
am
c7ee9122: am
183aa948: (-s ours) am
7b4170fa: Merge "Update Material link text to be colorAccent" into mnc-dev
* commit '
c7ee9122f03327dac0fb151f04a61def058238a7':
Jim Miller [Thu, 27 Aug 2015 19:20:32 +0000 (19:20 +0000)]
am
a5094db1: am
cd1e7f7b: (-s ours) am
45fcaa54: Merge "Don\'t wipe device because of short PIN, patterns or passwords" into mnc-dev
* commit '
a5094db1a83e077e2075942c3925b8806f34cbcb':
Alan Viverette [Thu, 27 Aug 2015 19:20:24 +0000 (19:20 +0000)]
am
5d0ad985: am
5be6cc6d: (-s ours) am
ef3f58e5: Merge "Make ResolverDrawerLayout look like a ScrollView to accessibility" into mnc-dev
* commit '
5d0ad98555727bfda35240e438884056c6de8904':
Alan Viverette [Thu, 27 Aug 2015 19:20:12 +0000 (19:20 +0000)]
am
405f2976: am
7b77b284: (-s ours) am
e76bf46a: Merge "Add badge content description to TargetInfo, use in ResolverActivity" into mnc-dev
* commit '
405f297671705ef9e86e44d36e4df793c3be04f6':
Billy Lau [Thu, 27 Aug 2015 19:19:58 +0000 (19:19 +0000)]
am
9bcb60c6: am
82330790: (-s ours) am
5680f9f6: Merge "Bug:
22879202 App compatibility with WRITE_SETTINGS failing" into mnc-dev
* commit '
9bcb60c6db2212c26b724562ce4d2aa820c2f886':
Svetoslav Ganov [Thu, 27 Aug 2015 19:19:29 +0000 (19:19 +0000)]
am
5d8b6de0: am
051a70e1: (-s ours) am
87920455: Merge "Fix NPE in AppOpsService" into mnc-dev
* commit '
5d8b6de0a9d5e9a1d69322c06173e55f90559006':
Svetoslav Ganov [Thu, 27 Aug 2015 19:18:55 +0000 (19:18 +0000)]
am
567d9a31: am
aec40925: (-s ours) am
0855357c: Merge "User correct category for finding headless sync adapters" into mnc-dev
* commit '
567d9a312af5112e728ec9761e0a6ae8d4dbfa23':
Lajos Molnar [Thu, 27 Aug 2015 19:18:17 +0000 (19:18 +0000)]
am
9d05ec89: am
a0426ee2: (-s ours) am
0ca1e98f: Merge "media: Clarify MediaCodec and CodecCapabilities documentation" into mnc-dev
* commit '
9d05ec892e7bf579021e07805317bc4006a4f407':
Todd Kennedy [Thu, 27 Aug 2015 19:17:50 +0000 (19:17 +0000)]
am
47447567: am
9f485905: (-s ours) am
772c6c0d: am
40f0efe0: Merge "Add a trace constant for PackageManager"
* commit '
47447567928bccbf594911cdf44184db73524fcd':
Ruben Brunk [Thu, 27 Aug 2015 19:17:24 +0000 (19:17 +0000)]
am
c378818f: am
7cf5a0f6: (-s ours) am
7469060e: Merge "Make vendor keys visible in Camera2 java APIs." into mnc-dev
* commit '
c378818f90eb9b477a3b4bf814b1eed08e8f7168':
Jason Monk [Thu, 27 Aug 2015 19:17:08 +0000 (19:17 +0000)]
am
69eeff95: am
93053a8e: (-s ours) am
66845a36: Add more dump info about emergency calls state
* commit '
69eeff95f3ba854f05e9567c0aed9a81c33ff873':
Svetoslav Ganov [Thu, 27 Aug 2015 19:16:56 +0000 (19:16 +0000)]
am
6f388544: am
52f805e4: (-s ours) am
8dbd4848: Merge "Add per UID control to app ops." into mnc-dev
* commit '
6f388544472fe2158c5d1b1ba89d3783e1cee4e2':
Jan Nordqvist [Thu, 27 Aug 2015 19:16:44 +0000 (19:16 +0000)]
am
904fae41: am
12836594: (-s ours) am
cb9c0940: Merge "Added logging in a few error paths for wifi config installation." into mnc-dev
* commit '
904fae414a3f28573ce78cb9e89dc2358552e0c0':
Chris Wren [Thu, 27 Aug 2015 19:16:31 +0000 (19:16 +0000)]
am
ec0f0d80: am
6fe94248: (-s ours) am
6e75e7dd: Merge "Instrument printing service for metrics collection." into mnc-dev
* commit '
ec0f0d80d60dea272440439f855b888d7d5df032':
Selim Cinek [Thu, 27 Aug 2015 19:16:15 +0000 (19:16 +0000)]
am
8e440ca1: am
54f9a21a: (-s ours) am
f92a1fdb: Fixed a bug where notifications shadows were blinking out
* commit '
8e440ca1f434f4c6efcfbeb78cda424414ecd609':
Yusuke Sato [Thu, 27 Aug 2015 19:15:46 +0000 (19:15 +0000)]
am
08c81790: am
c2369c53: (-s ours) am
b98e2353: am
158560ad: Merge "Distinguish user-requested shutdown from power-related ones"
* commit '
08c8179069121820b971b14850474613a03cdc3b':
Filip Gruszczynski [Thu, 27 Aug 2015 19:15:20 +0000 (19:15 +0000)]
am
a314af74: am
ce09247b: (-s ours) am
00ab3578: Merge "Make enter reveal animation be zorder top." into mnc-dev
* commit '
a314af742304c86cd5f108592b586d14c3bf40e8':
Dianne Hackborn [Thu, 27 Aug 2015 19:14:47 +0000 (19:14 +0000)]
am
b34fc71c: am
e3047ddc: (-s ours) am
fb68b0ad: Merge "Fix issue #
21895842: Add is_assist_blocked to assist.ViewNode.NodeProperties" into mnc-dev
* commit '
b34fc71c83a5f3adbc7e68f93c8e2c72de7d5881':
Jean-Michel Trivi [Thu, 27 Aug 2015 19:14:16 +0000 (19:14 +0000)]
am
9bbad697: am
c5827cec: (-s ours) am
ffbdb8ad: Merge "Fix that shutter sound does not play after ringer mode changes to vibrator" into mnc-dev
* commit '
9bbad697091ce07560337810461508178ecc763f':
Alan Viverette [Thu, 27 Aug 2015 19:13:47 +0000 (19:13 +0000)]
am
a4a3c81e: am
51a8fe95: (-s ours) am
5cca30a4: Merge "Revert two changes to LinearLayout measurement" into mnc-dev
* commit '
a4a3c81e6ba7a2e7c4c2e075cf1ab28a06a08b5a':
Alan Viverette [Thu, 27 Aug 2015 19:13:25 +0000 (19:13 +0000)]
am
5043aedb: am
d4c8f2a5: (-s ours) am
9d8a230f: Revert "View measurement optimization"
* commit '
5043aedb45a51d4d0b7ae1abbb2d914933b0bb66':
Winson Chung [Thu, 27 Aug 2015 19:13:00 +0000 (19:13 +0000)]
am
11db2375: am
7a8f112c: (-s ours) am
c35e670d: Moving removeTask to separate thread.
* commit '
11db23759dc7605f2a776c5945cc7c5b94c46558':
Winson Chung [Thu, 27 Aug 2015 19:12:44 +0000 (19:12 +0000)]
am
b6111f2b: am
e335de61: (-s ours) am
92e0c86f: Merge "Ensuring that we don\'t try to use and propagate null activity labels." into mnc-dev
* commit '
b6111f2b73c4fa1e4027e532549607dc23d65d60':
Deepanshu Gupta [Thu, 27 Aug 2015 19:12:30 +0000 (19:12 +0000)]
Wale Ogunwale [Thu, 27 Aug 2015 19:12:13 +0000 (19:12 +0000)]
am
b4fa3849: am
c274a207: (-s ours) am
f7e00dbd: Merge "Fixed issue with artifacts during scale-up transition animation" into mnc-dev
* commit '
b4fa38492f9d5f5aedca8905826eee9ed07eade7':
Dianne Hackborn [Thu, 27 Aug 2015 19:12:00 +0000 (19:12 +0000)]
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base
Dianne Hackborn [Thu, 27 Aug 2015 19:11:47 +0000 (19:11 +0000)]
am
768d1b35: am
b1dc3441: (-s ours) am
ebbc891a: Merge "Fix build." into mnc-dev
* commit '
768d1b356f890bcf3400278ee0089435407609dc':
Vadim Tryshev [Thu, 27 Aug 2015 19:11:36 +0000 (19:11 +0000)]
Merge "Removing profile's pinned apps upon a profile removal."
Glenn Kasten [Thu, 27 Aug 2015 19:11:18 +0000 (19:11 +0000)]
am
efb76c88: am
30981ed5: (-s ours) am
37f559be: Merge "Improve getTimestamp documentation" into mnc-dev
* commit '
efb76c88a77c02dd6b5cd45a7d8934a91f93676b':
Dianne Hackborn [Thu, 27 Aug 2015 19:10:53 +0000 (19:10 +0000)]
Dianne Hackborn [Thu, 27 Aug 2015 19:10:39 +0000 (19:10 +0000)]
am
58e1dd11: am
c14e670c: (-s ours) am
c1836bb0: Merge "Change MNC codename to just M." into mnc-dev
* commit '
58e1dd11f422e8be0acd71c4d0beedebb9eb2464':
Dianne Hackborn [Thu, 27 Aug 2015 19:10:19 +0000 (19:10 +0000)]
am
7db437d2: am
f2269f04: (-s ours) Change MNC codename to just M.
* commit '
7db437d29ca3ea42b427d7317c86dea88cb619bd':
Change MNC codename to just M.
Tyler Gunn [Thu, 27 Aug 2015 19:10:09 +0000 (19:10 +0000)]
am
4f273780: am
384fc141: (-s ours) am
d0694da4: Merge "Add telecom extra keys required for DMR release." into mnc-dev
* commit '
4f27378031afce7ccd87b6f8289941b61597ac15':
Julia Reynolds [Thu, 27 Aug 2015 19:09:59 +0000 (19:09 +0000)]
am
3425f463: am
77978934: (-s ours) am
5d6a2d38: Merge "Fix SysUI crash on device boot." into mnc-dev
* commit '
3425f46391389491951f05ac98fabb35012f3517':
Rubin Xu [Thu, 27 Aug 2015 19:09:48 +0000 (19:09 +0000)]
am
f7a301f0: am
19f7007b: (-s ours) am
9a81a182: Merge "Don\'t always transfer device owner status to other users." into mnc-dev
* commit '
f7a301f06c0ef5a0e34c00f783fd8487f48885de':
Benjamin Franz [Thu, 27 Aug 2015 19:09:28 +0000 (19:09 +0000)]
am
b94777c7: am
eb83e998: (-s ours) am
d692fcf1: Merge "Add missing return statement" into mnc-dev
* commit '
b94777c7f6a6dc62e0d1de27244519587cc5b261':
Lorenzo Colitti [Thu, 27 Aug 2015 19:09:11 +0000 (19:09 +0000)]
am
b5ea4712: am
be265a2b: (-s ours) am
496a9d26: Merge "Stop supporting legacy ConnectivityManager routing methods in M." into mnc-dev
* commit '
b5ea471201baeed21f927c545cbc09c5272a6292':
Dave Langemak [Thu, 27 Aug 2015 19:08:41 +0000 (19:08 +0000)]
am
6d86c6fb: am
4f3b189e: (-s ours) am
02565c36: Merge changes from topic \'fix-notification-inflation-2\' into mnc-dev
* commit '
6d86c6fb9d9cf60e5fdda39c0dc3ab1ad7c4c553':
Hung-ying Tyan [Thu, 27 Aug 2015 19:08:11 +0000 (19:08 +0000)]
am
8613bcdf: am
8be74fae: (-s ours) am
410abcdb: Merge "Revise lockdown check in getLegacyVpnInfo()" into mnc-dev
* commit '
8613bcdf9efaf1ae1fc31b2a22f0787668f13bf2':
Geoff Mendal [Thu, 27 Aug 2015 19:07:43 +0000 (19:07 +0000)]
am
2f3c72b9: (-s ours) am
c8dcee0f: (-s ours) am
bbb47d88: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
2f3c72b977efe0fab18cff7c8ab35e7847953841':
Ronghua Wu [Thu, 27 Aug 2015 19:07:27 +0000 (19:07 +0000)]
am
e7baf7f8: am
db29b894: (-s ours) am
e8b7febd: Merge "media: use blocks number to find closest size" into mnc-dev
* commit '
e7baf7f830714aa3fa8d4ed5bb93247a195304a9':
Jeff Sharkey [Thu, 27 Aug 2015 19:07:15 +0000 (19:07 +0000)]
am
c20c0eee: am
1ff0d50c: (-s ours) am
5db4cc8f: Merge "Handle volumes without visible paths." into mnc-dev
* commit '
c20c0eee8461542316e17f27efef6a982f2e55c6':
Adam Lesinski [Thu, 27 Aug 2015 19:07:05 +0000 (19:07 +0000)]
am
45732432: am
10730b69: (-s ours) am
e3b0119f: Merge "AAPT: Fix resource versioning" into mnc-dev
* commit '
45732432a136fcb9eab9ab97d2929c2c913801f6':
Selim Cinek [Thu, 27 Aug 2015 19:06:54 +0000 (19:06 +0000)]
am
a8f22b80: am
c0d9c0c1: (-s ours) am
b9f30b26: Merge "The heads up now correctly dissapears when clicking" into mnc-dev
* commit '
a8f22b8024b4d2abfa53d7b25ea97a0c2adcbf93':
Amit Mahajan [Thu, 27 Aug 2015 19:06:43 +0000 (19:06 +0000)]
am
b52413ce: am
8ca5a84a: (-s ours) am
53c75014: Merge "Add OrSelf to privileged permission check." into mnc-dev
* commit '
b52413ceebc03716beffe1122025d6648474c4cf':
Adam Lesinski [Thu, 27 Aug 2015 19:06:31 +0000 (19:06 +0000)]
am
4839117e: am
1c023b5a: (-s ours) am
00f7cb92: Merge "BatteryStats: include mobile radio active count and unknown time in checkin" into mnc-dev
* commit '
4839117eba041eaacf6153aa75e1e82a71cb22e2':
Andre Eisenbach [Thu, 27 Aug 2015 19:06:22 +0000 (19:06 +0000)]
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base
Andre Eisenbach [Thu, 27 Aug 2015 19:06:02 +0000 (19:06 +0000)]
am
c8bbac47: am
4a622aa9: (-s ours) am
3bf1ac54: Bluetooth: Don\'t call beginBroadcast() while in a broadcast
* commit '
c8bbac47f4069a53b07bf36c6052e89eb2c6b917':
Stefan Kuhne [Thu, 27 Aug 2015 19:05:59 +0000 (19:05 +0000)]
Merge "Dont update thumbnails of freeform windows on focus change"
Carlos Valdivia [Thu, 27 Aug 2015 19:05:42 +0000 (19:05 +0000)]
am
42fc0b71: am
b9441edd: (-s ours) am
26ae600b: Merge "Permissions: GET_ACCOUNTS permission cleanup" into mnc-dev
* commit '
42fc0b71f6444b594ed1489bca130f6405c51e3f':
Deepanshu Gupta [Thu, 27 Aug 2015 19:05:16 +0000 (19:05 +0000)]
am
3ec11464: am
a1e1d142: (-s ours) am
7676e403: Merge changes I4c215676,Ib476302c,I0aede288,I9241dec7,Ibe7167a6, ... into mnc-dev
* commit '
3ec11464606af6f192da91391d02fb0635672f03':
Selim Cinek [Thu, 27 Aug 2015 19:04:53 +0000 (19:04 +0000)]
am
b956c53c: am
758a28d4: (-s ours) am
20a5d331: Merge "Fixed a heads up crash" into mnc-dev
* commit '
b956c53c604ede403bce065919f937cf8b9cffac':
Phil Burk [Thu, 27 Aug 2015 19:04:38 +0000 (19:04 +0000)]
am
bc763696: am
65e6e984: (-s ours) am
8f5228af: Merge "UsbMidiDevice: add timestamps for input events" into mnc-dev
* commit '
bc7636961fddb6a3968e03104c6545ebbca59a59':
Phil Burk [Thu, 27 Aug 2015 19:04:26 +0000 (19:04 +0000)]
am
fdaeb1a7: am
1742d926: (-s ours) am
2f1a08e6: Merge "MIDI docs BTLE: how to open BTLE MIDI devices" into mnc-dev
* commit '
fdaeb1a72316f9157a3e82cd1c23cc4897902a95':
Phil Burk [Thu, 27 Aug 2015 19:04:15 +0000 (19:04 +0000)]
am
70922651: am
f6615376: (-s ours) am
fdcd8216: Merge "MIDI package doc: add hasSystemFeature() call" into mnc-dev
* commit '
70922651c87f7312e4c80c50891681e650215aaf':
Phil Burk [Thu, 27 Aug 2015 19:04:07 +0000 (19:04 +0000)]
am
b5d922f5: am
0f1014ae: (-s ours) am
559a2420: Merge "MidiDevice: document that opens can return nulls" into mnc-dev
* commit '
b5d922f5f44393d553fd2334d5c93f66c9fd2fd0':
Fyodor Kupolov [Thu, 27 Aug 2015 19:03:58 +0000 (19:03 +0000)]
am
3831d56c: am
123a9f93: (-s ours) am
4988378c: Merge "Introduced android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev
* commit '
3831d56c961b169d2cd14a0e43822036bd3df9ef':
Shawn Willden [Thu, 27 Aug 2015 19:03:50 +0000 (19:03 +0000)]
am
4eebf1a7: am
3d4b9655: (-s ours) am
75e51ec0: Merge "Raw RSA Cipher relies on keymaster for padding and range checks." into mnc-dev
* commit '
4eebf1a7f4721e444472d5463dc6c4d5230f35b0':
Chris Craik [Thu, 27 Aug 2015 19:03:42 +0000 (19:03 +0000)]
am
b36291fb: am
dd497cab: (-s ours) am
730c0f65: Merge "Fix stencil mask usage in HWUI" into mnc-dev
* commit '
b36291fbac4de8198a19f2000881c5a64ec4600e':
Shishir Agrawal [Thu, 27 Aug 2015 19:03:32 +0000 (19:03 +0000)]
am
e735236f: am
e43beb5d: (-s ours) am
8d1d8fda: Merge "Add SMS permissions for Carrier app." into mnc-dev
* commit '
e735236f7afd286771b97654ad21d4d95e6f23b5':
Vadim Tryshev [Thu, 27 Aug 2015 00:52:48 +0000 (17:52 -0700)]
Removing profile's pinned apps upon a profile removal.
Bug:
20024603
Change-Id: I4b17bffe202d3f4cf211b3289ee021c4ec16e91f
Chris Tate [Thu, 27 Aug 2015 19:03:21 +0000 (19:03 +0000)]
am
f3fd110b: am
ba0d1eef: (-s ours) am
74a0744e: Merge "Fix issues around process teardown after full-data restore" into mnc-dev
* commit '
f3fd110bb6bce372dd8afc2490190749d06fb713':
Simranjit Kohli [Thu, 27 Aug 2015 19:03:03 +0000 (19:03 +0000)]
am
c76b4642: 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 '
c76b46429383c74b851f40bd873c29396ef91585':
Alan Viverette [Thu, 27 Aug 2015 19:02:45 +0000 (19:02 +0000)]
am
4a369344: am
ca5fb5c3: (-s ours) am
559daf7a: Merge "Include non-zero dimension views in excess space calculation" into mnc-dev
* commit '
4a369344a9aa9c1e78410ae60e379da11620b581':
Dan Sandler [Thu, 27 Aug 2015 19:02:19 +0000 (19:02 +0000)]
am
bc90e171: am
b18c2c42: (-s ours) am
7bd8e6a8: DateTimeView: don\'t assume you have an ApplicationContext.
* commit '
bc90e171337fbaf10879f47703d6f7133f1b6089':
Alan Viverette [Thu, 27 Aug 2015 19:02:02 +0000 (19:02 +0000)]
am
f9bbb112: am
a83fb6f6: (-s ours) am
c1d5b6c1: Merge "Move padding from navigation and overflow icons to Toolbar" into mnc-dev
* commit '
f9bbb112b8bb4acd0f52e2f6e7fe84dfa744dac0':
Elliott Hughes [Thu, 27 Aug 2015 19:01:49 +0000 (19:01 +0000)]
am
9f3426a8: am
d065fd41: (-s ours) am
204b4157: am
f8a6a2f6: Merge "Use _WIN32 rather than HAVE_WINSOCK."
* commit '
9f3426a83db9aea16fd90e7c531a87d55ed7b81b':
Jim Miller [Thu, 27 Aug 2015 19:01:36 +0000 (19:01 +0000)]
am
fbdd8b59: am
0c152b9e: (-s ours) am
30c5da9c: Don\'t call cancel() when fingerprint auth fails
* commit '
fbdd8b59dc7f7c12c967d89c1ac3a2273d566f24':
Daniel Sandler [Thu, 27 Aug 2015 19:01:26 +0000 (19:01 +0000)]
am
eef5d8de: am
b10d22ff: (-s ours) am
bbe1682b: Merge changes from topic \'fix-media-notifications\' into mnc-dev
* commit '
eef5d8de0834156c5d2583b222c624b353fc9ca5':
Paul Jensen [Thu, 27 Aug 2015 19:01:19 +0000 (19:01 +0000)]
am
89fd13dc: am
d732799a: (-s ours) am
a991c66c: Merge "Fix missing onLost NetworkCallbacks when network loses capability" into mnc-dev
* commit '
89fd13dc628c1e33de492f3ce96844e121302c1c':
Dianne Hackborn [Thu, 27 Aug 2015 19:01:10 +0000 (19:01 +0000)]
am
3e9d32d3: am
98169db3: (-s ours) am
8d3a67a8: Merge "More maybe fix issue #
22765972: Binder transactions running out..." into mnc-dev
* commit '
3e9d32d3a5bfebf8f96f1bfa87464bb5af2bd125':
Jason Monk [Thu, 27 Aug 2015 19:00:58 +0000 (19:00 +0000)]
am
1fbb06f6: am
710091b1: (-s ours) am
beb3185f: Merge "Fix touch target for settings icon" into mnc-dev
* commit '
1fbb06f6a7f2d4de11668ad5f46481cfc593ae72':
Jorim Jaggi [Thu, 27 Aug 2015 19:00:40 +0000 (19:00 +0000)]
am
2c7ea6ed: am
e987d609: (-s ours) am
26aa04c3: Fix state weirdness in the panel
* commit '
2c7ea6edf51fd1369a374c7948ebccd556df9fbc':
Elliott Hughes [Thu, 27 Aug 2015 19:00:20 +0000 (19:00 +0000)]
am
ee0d0692: am
e6286724: (-s ours) am
e528f048: am
84a04d52: Merge "Move frameworks/base/tools/ off AndroidConfig.h."
* commit '
ee0d0692502312caec57e3bf590e41aebc0df530':
Jorim Jaggi [Thu, 27 Aug 2015 18:59:53 +0000 (18:59 +0000)]