OSDN Git Service
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':
Ji Yang [Thu, 27 Aug 2015 09:29:23 +0000 (09:29 +0000)]
am
ba29aaf2: (-s ours) am
499f084d: Merge "Add API to let carrier app send SMS without auto perisisting." into mnc-dev
* commit '
ba29aaf21969aafa4211d9d077bc44dad837d20b':
Dan Sandler [Thu, 27 Aug 2015 09:29:10 +0000 (09:29 +0000)]
am
b4c12fdb: (-s ours) am
25ffc7ad: Accessibility: Read the time correctly in quick settings.
* commit '
b4c12fdb522501b86d45ab0c49ebb86bd5d23076':
Robert Greenwalt [Thu, 27 Aug 2015 09:28:48 +0000 (09:28 +0000)]
am
b4a5f7d9: (-s ours) am
771d210a: Merge "Revert "DO NOT MERGE Enhance local log."" into mnc-dev
* commit '
b4a5f7d9138523cd044c0243a1790156f818a540':
Svetoslav Ganov [Thu, 27 Aug 2015 09:28:19 +0000 (09:28 +0000)]
am
6f73eb0c: (-s ours) am
393c7fb2: Merge "Default grants: handle update system packages" into mnc-dev
* commit '
6f73eb0c0869f27693f2cde0c8e8f681ae3e05d2':
Adrian Roos [Thu, 27 Aug 2015 09:27:42 +0000 (09:27 +0000)]
am
78406854: (-s ours) am
e2cd8419: Merge "Fix pattern lock for accessibility" into mnc-dev
* commit '
7840685465f988e9a8afc113298096fe9481e87e':
Alan Viverette [Thu, 27 Aug 2015 09:27:20 +0000 (09:27 +0000)]
am
7a763bc1: (-s ours) am
93184eef: Merge "DO NOT MERGE: Don\'t backup night mode setting" into mnc-dev
* commit '
7a763bc1552da5ddf1944ddf8946d0292110ce55':
Adrian Roos [Thu, 27 Aug 2015 09:27:11 +0000 (09:27 +0000)]
am
bbe80810: (-s ours) am
726d47b7: Merge "Fix and deprecate lock pattern related settings" into mnc-dev
* commit '
bbe80810ab76301fa7a2502f60a20ad3c9b9253d':
Alan Viverette [Thu, 27 Aug 2015 09:27:03 +0000 (09:27 +0000)]
am
0322ccf6: (-s ours) am
47a74e7e: Merge "Ensure maxHeight is at least 0 during measureChildHorizontal()" into mnc-dev
* commit '
0322ccf69a40786550ccb75f81881f2915906f17':
Alan Viverette [Thu, 27 Aug 2015 09:26:55 +0000 (09:26 +0000)]
am
401de11f: (-s ours) am
5c380efa: Merge "Always distribute excess space in LinearLayout measurement" into mnc-dev
* commit '
401de11f16274df1dd248f4697cd159ccfca37c9':
Jeff Sharkey [Thu, 27 Aug 2015 09:26:46 +0000 (09:26 +0000)]
am
4854d113: (-s ours) am
b86048da: Merge "Always return content Uri for downloads." into mnc-dev
* commit '
4854d113cee165cdc63a4f0b0e1d7b5f91cd55ce':
Raph Levien [Thu, 27 Aug 2015 09:26:39 +0000 (09:26 +0000)]
am
9c5a06aa: (-s ours) am
c3cc344d: Merge "Release text when finishing StaticLayout.Builder" into mnc-dev
* commit '
9c5a06aa9cd18e844e07760696264b86f13332d7':
Wale Ogunwale [Thu, 27 Aug 2015 09:26:31 +0000 (09:26 +0000)]
am
c4887d0f: (-s ours) am
25782ef8: Merge "Added stack id to TaskRecord dump." into mnc-dev
* commit '
c4887d0f4e66ca4e98dd619b3aa44ef4d768794e':
Roshan Pius [Thu, 27 Aug 2015 09:26:23 +0000 (09:26 +0000)]
am
d26bc1c0: (-s ours) am
944b6362: Merge "Add a command to register SIM Phone account." into mnc-dev
* commit '
d26bc1c0b4839d5e3bba01c2487194033dc8341a':
Maurice Lam [Thu, 27 Aug 2015 09:26:12 +0000 (09:26 +0000)]
am
7ce565f3: (-s ours) am
75d958c4: Merge "Disable launching assist during setup" into mnc-dev
* commit '
7ce565f39b6865da739232f0a3f753a5fd6ec82c':
Christine Hallstrom [Thu, 27 Aug 2015 09:25:55 +0000 (09:25 +0000)]
am
584d6121: (-s ours) am
a42e6816: Merge "Change NTP polling interval from 10 days to 24 hours." into mnc-dev
* commit '
584d61211f428575f4746c3ee2f66a6f8a5807af':
Geoff Mendal [Thu, 27 Aug 2015 09:25:31 +0000 (09:25 +0000)]
am
62e2b84c: (-s ours) am
3986360a: (-s ours) Import translations. DO NOT MERGE
* commit '
62e2b84ce84144ab1b6855560f403058a9324abd':
Svetoslav Ganov [Thu, 27 Aug 2015 09:25:05 +0000 (09:25 +0000)]
am
862dc4f2: (-s ours) am
9352af2a: Merge "Remove dependencies on the package installer\'s package name" into mnc-dev
* commit '
862dc4f2c9053c29e85d7ef4a625bcc09c7aa57f':
Sailesh Nepal [Thu, 27 Aug 2015 09:24:47 +0000 (09:24 +0000)]
am
04a69aa1: (-s ours) am
6b96de8d: Merge "Default permissions for sim call manager" into mnc-dev
* commit '
04a69aa102be7ae4f31bf8a990f4f8ef9ea6f230':
Svetoslav Ganov [Thu, 27 Aug 2015 09:24:35 +0000 (09:24 +0000)]
am
7b09e2c0: (-s ours) am
a7a65ee4: Merge "Allow non system to set perm policy flags - needed by the installer" into mnc-dev
* commit '
7b09e2c054a8ef3165d130d8ef97b92bcd213764':
Svetoslav Ganov [Thu, 27 Aug 2015 09:24:23 +0000 (09:24 +0000)]
am
986812a6: (-s ours) am
120a86ac: Merge "Do not reset runtime permissions on upgrade" into mnc-dev
* commit '
986812a6a25d159b7fbe5af9daf9d5e7dcda35d4':
Dianne Hackborn [Thu, 27 Aug 2015 09:24:14 +0000 (09:24 +0000)]
am
c2a02439: (-s ours) am
eda1cc50: Merge "Work on issue #
22765972: Binder transactions running out of address..." into mnc-dev
* commit '
c2a024392ac7564126c0e09ee77e529fd1c37365':
Nicolas Prévot [Thu, 27 Aug 2015 09:24:05 +0000 (09:24 +0000)]
am
91775db6: (-s ours) am
64ac302f: Merge "Send a public broadcast when the device owner is set." into mnc-dev
* commit '
91775db6b5154b3771ffcb4bfee84bfc3b884296':
Elliott Hughes [Thu, 27 Aug 2015 09:23:58 +0000 (09:23 +0000)]
am
49d7d481: (-s ours) am
a7e6be68: am
7d71d88c: Merge "Use _WIN32 rather than HAVE_WINDOWS_PATHS."
* commit '
49d7d4810943a67519b02f53299e6836070aa9b6':
Chris Wren [Thu, 27 Aug 2015 09:23:46 +0000 (09:23 +0000)]
am
2eeb47c6: (-s ours) am
1bd310e1: Merge "import more metrics enums" into mnc-dev
* commit '
2eeb47c6a15141dc78bef94fc6f173d833f58143':
Paul Jensen [Thu, 27 Aug 2015 09:23:27 +0000 (09:23 +0000)]
am
1ed96576: (-s ours) am
30813942: Merge "Disable WiFi autojoin when user decides via "Stay connected?" dialog" into mnc-dev
* commit '
1ed96576a8a2faaafb3c677081efd53512dac551':
Narayan Kamath [Thu, 27 Aug 2015 09:22:57 +0000 (09:22 +0000)]
am
f1fce87a: (-s ours) am
7157c2ca: Merge "Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."" into mnc-dev
* commit '
f1fce87a2859093df25a139b99d0ed3369ea8b20':
Martijn Coenen [Thu, 27 Aug 2015 09:22:23 +0000 (09:22 +0000)]
am
966e276f: (-s ours) am
50184147: Merge "Resource for setting default NFC payment component." into mnc-dev
* commit '
966e276fc4fd1a000ae6accb058d416e43bde4bc':
Shawn Willden [Thu, 27 Aug 2015 09:21:50 +0000 (09:21 +0000)]
am
48951e4a: (-s ours) am
a7b4d6dc: Merge "Keymaster digest/padding NONE no longer means ANY." into mnc-dev
* commit '
48951e4a80dfa576993b5fd1d9c8e13608b3e6a4':
Jeff Sharkey [Thu, 27 Aug 2015 09:21:12 +0000 (09:21 +0000)]
am
667f35fa: (-s ours) am
b8040265: Merge "Give secondary users read-only physical cards." into mnc-dev
* commit '
667f35fab8ee5d06e4a28421d05b01ffff0fbb4a':
Ronghua Wu [Thu, 27 Aug 2015 09:20:50 +0000 (09:20 +0000)]
am
da0b2ce3: (-s ours) am
02022b70: Merge "media: fix estimateFrameRatesFor to use correct ratio" into mnc-dev
* commit '
da0b2ce39ccc0eb2042cf601ff89883f67b4fa10':
Dianne Hackborn [Thu, 27 Aug 2015 09:20:37 +0000 (09:20 +0000)]
am
37cf391c: (-s ours) am
b310c894: Merge "Fix issue #
22802691: APR: NPE in ActivityRecord" into mnc-dev
* commit '
37cf391caf35ed0424378a20ed674240ea8528aa':
Dianne Hackborn [Thu, 27 Aug 2015 09:20:23 +0000 (09:20 +0000)]
am
cf887f5c: (-s ours) am
5b009d52: Merge "Fix issue #
22802617: APR: spurious wtf when restarting a persistent process" into mnc-dev
* commit '
cf887f5c91964ff939b5bcc635b3aeff88b796ed':
Dianne Hackborn [Thu, 27 Aug 2015 09:20:06 +0000 (09:20 +0000)]
am
9d3a0efa: (-s ours) am
b492ced8: Merge "Fix issue #
22802782: APR: NPE in package manager with bad intent data" into mnc-dev
* commit '
9d3a0efaef4dd33fac81ddcff88d9bdc467e463d':
Adam Lesinski [Thu, 27 Aug 2015 09:19:39 +0000 (09:19 +0000)]
am
9466fa27: (-s ours) am
c96e6f19: Merge "BatteryStats: Use proper power calculator when energy data is received" into mnc-dev
* commit '
9466fa27b1dc46376ebde62a300954bd88a198d7':
Jason Monk [Thu, 27 Aug 2015 09:19:07 +0000 (09:19 +0000)]
am
139dabcc: (-s ours) am
fbcbad13: Merge "Add sizes to SysUI tests" into mnc-dev
* commit '
139dabcc427856692698ca489ec43cffc7a99252':
Aravind Akella [Thu, 27 Aug 2015 09:18:30 +0000 (09:18 +0000)]
am
4633f371: (-s ours) am
15938235: Merge "Call getInstanceForPackage instead of creating a new SensorManager instance." into mnc-dev
* commit '
4633f37107980378b1583b22437a31168cf359e8':
Jorim Jaggi [Thu, 27 Aug 2015 09:17:57 +0000 (09:17 +0000)]
am
66c3fc38: (-s ours) am
0d210f63: Animation for touch, wake and unlock
* commit '
66c3fc38545923152a8bb04e8a73418205cec21d':
Chris Tate [Thu, 27 Aug 2015 09:17:29 +0000 (09:17 +0000)]
am
36d5edff: (-s ours) am
751a96a0: Merge "Don\'t redundantly call transport.finishRestore()" into mnc-dev
* commit '
36d5edff87b7a222575b5b8b93fe4244618708df':
Zach Johnson [Thu, 27 Aug 2015 09:17:04 +0000 (09:17 +0000)]
am
6b026e31: (-s ours) am
5faa0336: Merge "Add filter for personal apps that are not disabled until first use" into mnc-dev
* commit '
6b026e31730355948e175b88d14c5bbf1d2b8634':
Todd Kennedy [Thu, 27 Aug 2015 09:16:37 +0000 (09:16 +0000)]
am
beef2b78: (-s ours) am
f2c616ed: Merge "Partially revert package freezing" into mnc-dev
* commit '
beef2b78ada95582552ed194fcc57e633b6afec6':
Tyler Gunn [Thu, 27 Aug 2015 09:16:11 +0000 (09:16 +0000)]
am
11f2dbf7: (-s ours) am
bdbec480: Merge "Add "Call subject" capability to phone accounts." into mnc-dev
* commit '
11f2dbf7efbb56b737b9332ebead6a24a73c7078':
Dianne Hackborn [Thu, 27 Aug 2015 09:15:38 +0000 (09:15 +0000)]
am
8b679bfa: (-s ours) am
3551a59b: Merge "Work on issue #
21516866: Implement voice interaction in ResolverActivity" into mnc-dev
* commit '
8b679bfa3691d71c4ee70e23fc06edc5a3799483':
Jorim Jaggi [Thu, 27 Aug 2015 09:15:11 +0000 (09:15 +0000)]
am
69aa584f: (-s ours) am
850dd690: Merge "Don\'t use screenshot if structure is disabled (1/2)" into mnc-dev
* commit '
69aa584f4e3d688fc8a9c8c39855cda5e7895355':
Robert Greenwalt [Thu, 27 Aug 2015 09:14:53 +0000 (09:14 +0000)]
am
1bf3bec7: (-s ours) am
b3c93c5f: Merge "Un-remove legacy ConnectivityManager API." into mnc-dev
* commit '
1bf3bec726f6d84ffc6035d08ea3d6eeead6a9f7':
Jason Monk [Thu, 27 Aug 2015 09:14:38 +0000 (09:14 +0000)]
am
e6e2c108: (-s ours) am
35066219: Merge "Fix network name not showing in QS sometimes" into mnc-dev
* commit '
e6e2c10860f0e274a73bd7bd16dd905e1ff40ec3':
Adam Lesinski [Thu, 27 Aug 2015 09:14:23 +0000 (09:14 +0000)]
am
88b65478: (-s ours) am
60261137: Merge "BatteryStats: Compensate for accuracy issues when reporting WiFi energy data issues with Slog.wtf" into mnc-dev
* commit '
88b654789811a62c5ecd0966ba9d19ebc169e97d':
Lorenzo Colitti [Thu, 27 Aug 2015 09:14:11 +0000 (09:14 +0000)]
am
8f4787e6: (-s ours) am
e288b3af: Merge changes I5c994de5,I6cb0dd84 into mnc-dev
* commit '
8f4787e615c483081c7c4844b0f81c0e0d8dfca8':
Jorim Jaggi [Thu, 27 Aug 2015 09:13:58 +0000 (09:13 +0000)]
am
ad780f33: (-s ours) am
965bab2b: Merge "Allow assist gesture when notification shade is expanded" into mnc-dev
* commit '
ad780f3330dcf6330dbe3ff695e4ff3ae2f4d889':
Mady Mellor [Thu, 27 Aug 2015 09:13:46 +0000 (09:13 +0000)]
am
506424fc: (-s ours) am
beb6e668: Merge "Allow text selection handles to scroll horizontally" into mnc-dev
* commit '
506424fc9942c7e6baea4c9c79f6579717ebbbc6':
Ruben Brunk [Thu, 27 Aug 2015 09:13:33 +0000 (09:13 +0000)]
am
ba140949: (-s ours) am
ee2a16b5: Merge "Update DngCreator to correctly handle array sizes." into mnc-dev
* commit '
ba140949ad27642a7e94c82511508d740fa1fa11':
Adam Lesinski [Thu, 27 Aug 2015 09:13:15 +0000 (09:13 +0000)]
am
33d4bd4a: (-s ours) am
fd44b56d: Merge "AAPT: Fix printing of resource configurations" into mnc-dev
* commit '
33d4bd4a9b42972fee3fc84a8babcef1030b72c1':
Filip Gruszczynski [Thu, 27 Aug 2015 09:12:53 +0000 (09:12 +0000)]
am
089f65ed: (-s ours) am
f63800dd: Merge "Remove unnecessary relayout call from traversals." into mnc-dev
* commit '
089f65ed1e635b96f341562c78e86e43f20211a5':
Fyodor Kupolov [Thu, 27 Aug 2015 09:12:30 +0000 (09:12 +0000)]
am
cb3ae68e: (-s ours) am
67a32c49: Merge "Added missing check for MANAGE_USERS" into mnc-dev
* commit '
cb3ae68e145ab33df2502e0cc321566cf4ae8aaf':
Raph Levien [Thu, 27 Aug 2015 09:12:13 +0000 (09:12 +0000)]
am
199c0b3f: (-s ours) am
e827c252: Merge "Allow soft hyphens in languages without patterns" into mnc-dev
* commit '
199c0b3f0e03d109d4769d7e01e155b26d946d7c':
Jeff Sharkey [Thu, 27 Aug 2015 09:11:58 +0000 (09:11 +0000)]
am
759fe1ec: (-s ours) am
2e606d7b: Enforce DISALLOW_MOUNT_PHYSICAL_MEDIA.
* commit '
759fe1ec66a6c7b23e2556fca2e98f3ffb2a0a55':
Selim Cinek [Thu, 27 Aug 2015 09:11:44 +0000 (09:11 +0000)]
am
07be576d: (-s ours) am
71bfb270: Merge "Added the content description for the fingerprint icon" into mnc-dev
* commit '
07be576dec17a2e7f0b4507dd20e10fd268ef649':
Adam Lesinski [Thu, 27 Aug 2015 09:11:31 +0000 (09:11 +0000)]
am
97bb9d05: (-s ours) am
fc28d6fc: Merge "BatteryStats: Prevent BatteryService from blocking" into mnc-dev
* commit '
97bb9d0546e8672e0467c838c4c374e86e071d09':
Julia Reynolds [Thu, 27 Aug 2015 09:11:19 +0000 (09:11 +0000)]
am
c150c328: (-s ours) am
f68e0236: Merge "Allow Settings to set background data restrict on secondary users." into mnc-dev
* commit '
c150c328de1b8c132079f63aa1cc79279cb0c859':
George Mount [Thu, 27 Aug 2015 09:11:06 +0000 (09:11 +0000)]
am
0483d720: (-s ours) am
4ba1820b: Revert "am
1c964bec: Revert "am
6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs""
* commit '
0483d7208b4eee662050ba80e4523cdfbd922178':
Jason Monk [Thu, 27 Aug 2015 09:10:53 +0000 (09:10 +0000)]
am
515e444f: (-s ours) am
66179430: Merge "Fix QS switch accessibility problem" into mnc-dev
* commit '
515e444fdb24bbb414d4ab55407b8ed803dd0578':
Svetoslav Ganov [Thu, 27 Aug 2015 09:10:32 +0000 (09:10 +0000)]
am
817ea6d4: (-s ours) am
8a54da92: Merge "Pass correct extras to the custom print options activity" into mnc-dev
* commit '
817ea6d48d25540a6267cc58411bd6581a15778f':
Jorim Jaggi [Thu, 27 Aug 2015 09:10:09 +0000 (09:10 +0000)]
am
d315926a: (-s ours) am
9e49b5d6: Merge "Move PIN/Pattern appear animation to RenderThread (1/2)" into mnc-dev
* commit '
d315926aecc36f86406bb2fefcb8742cd7238d91':
George Mount [Thu, 27 Aug 2015 09:09:45 +0000 (09:09 +0000)]
am
ab173ca6: (-s ours) am
01fe3f86: am
1c964bec: Revert "am
6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"
* commit '
ab173ca630c8da856dedc06d4450fcc5e4b8c739':
Fyodor Kupolov [Thu, 27 Aug 2015 09:09:19 +0000 (09:09 +0000)]
am
bd193f38: (-s ours) am
b83b5fa6: Merge "Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION" into mnc-dev
* commit '
bd193f38f7f9cb62248dad8aca3808468c96ecaa':
Chris Craik [Thu, 27 Aug 2015 09:09:03 +0000 (09:09 +0000)]
am
71fb7e59: (-s ours) am
4604c1dc: Merge "Fix bitmap get/set pixels for ALPHA_8" into mnc-dev
* commit '
71fb7e5927a6f90bf18da7e8c040be529c167688':
Phil Burk [Thu, 27 Aug 2015 09:08:55 +0000 (09:08 +0000)]
am
a37a1b00: (-s ours) am
fef1b289: Merge "MIDI: fix running status parser" into mnc-dev
* commit '
a37a1b006e4485a04befdc51945b7ca5d249f29b':
Tim Volodine [Thu, 27 Aug 2015 09:08:47 +0000 (09:08 +0000)]
am
6c1e0991: (-s ours) am
91b31b53: Merge "Revert "Invoke geolocation permissions callback with denied state by default."" into mnc-dev
* commit '
6c1e0991464e492770514608227d5c9b7eb1b0ac':
George Mount [Thu, 27 Aug 2015 09:08:38 +0000 (09:08 +0000)]
am
2d574990: (-s ours) am
9c450936: am
c571a9a1: am
6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs
* commit '
2d574990afccde49e7251565929df7841b08eb79':
George Mount [Thu, 27 Aug 2015 09:08:30 +0000 (09:08 +0000)]
am
c22b89ad: (-s ours) am
c0231f26: (-s ours) am
a29cfefe: (-s ours) am
95e6ae3a: (-s ours) Merge "DO NOT MERGE ANYWHERE. Add data binding to built javadoc." into mnc-preview-docs
* commit '
c22b89ad1cda0f3e02865bdbb48ee9dddee26122':
Chris Wren [Thu, 27 Aug 2015 09:08:23 +0000 (09:08 +0000)]
am
229b49c3: (-s ours) am
11f4cb1b: Merge "decide interruptions based on current data, not previous data." into mnc-dev
* commit '
229b49c39b0b9d4c07750d316856209fb4f2fb65':
Chris Wren [Thu, 27 Aug 2015 09:08:14 +0000 (09:08 +0000)]
am
aaa23354: (-s ours) am
45a0bb18: Merge "add ticker to enqueue message for easier debugging" into mnc-dev
* commit '
aaa233547668d2c9225a7369dbd2bfb4f0cd8f32':
Erik Kline [Thu, 27 Aug 2015 09:08:03 +0000 (09:08 +0000)]
am
229e4d9a: (-s ours) am
a7bdace2: Merge "Change to connectivitycheck.gstatic.com" into mnc-dev
* commit '
229e4d9ae4c3757d7ee90074bb63ab0e984d1752':
Nick Kralevich [Thu, 27 Aug 2015 09:07:47 +0000 (09:07 +0000)]
am
faf11661: (-s ours) am
73612fbb: am
e942b459: Merge "ActivityManagerService: delete unnecessary mkdir"
* commit '
faf11661f07b18808674e60d2245337685982e3d':
Jeff Sharkey [Thu, 27 Aug 2015 09:07:24 +0000 (09:07 +0000)]
am
fdda1ec3: (-s ours) am
8be305dd: Merge "Also check app-ops on path-permissions." into mnc-dev
* commit '
fdda1ec30b98b983bab08a97f0eb63d05e06d904':
Selim Cinek [Thu, 27 Aug 2015 09:07:02 +0000 (09:07 +0000)]
am
fe8310b7: (-s ours) am
d9f1a0c3: Merge "Fixed wake to unlock when the device has never been unlocked" into mnc-dev
* commit '
fe8310b72efc22b806e28bd3cc11fd90e93dc8fb':
Jorim Jaggi [Thu, 27 Aug 2015 09:06:47 +0000 (09:06 +0000)]
Adam Lesinski [Thu, 27 Aug 2015 09:06:32 +0000 (09:06 +0000)]
am
9736d0cc: (-s ours) am
2a493532: Merge "BatteryStats: Decode wakeup reasons in Java" into mnc-dev
* commit '
9736d0ccaa741b2523163ac7906d873c25330ec0':
Selim Cinek [Thu, 27 Aug 2015 09:06:20 +0000 (09:06 +0000)]
am
d475549f: (-s ours) am
f8acd1d8: Merge "Adapted the behavior when unlocking with fingerprint is not allowed" into mnc-dev
* commit '
d475549f4079c2bd08e98266a10290f2d277718f':
OSDN Git Service
