OSDN Git Service
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':
Andreas Gampe [Thu, 27 Aug 2015 09:06:12 +0000 (09:06 +0000)]
am
44959639: (-s ours) am
ac2c632f: am
c0999f78: Merge "Frameworks/base: Hand fingerprint to ART"
* commit '
4495963910bbb2ddb55f148efd9ab181475927ad':
Chris Banes [Thu, 27 Aug 2015 09:06:04 +0000 (09:06 +0000)]
am
a8c721a4: (-s ours) am
c174de0a: am
5442932a: am
7b099152: Merge "v22.2.1 support api diff" into mnc-preview-docs
* commit '
a8c721a4f2c844f87bc9b0ece25e6c7570966285':
Adrian Roos [Thu, 27 Aug 2015 09:05:55 +0000 (09:05 +0000)]
am
ba43413d: (-s ours) am
384b5d20: am
a65de4fd: am
b2f8c716: am
50ed152a: am
7f63ef38: am
9b6a6099: Prevent insanely long passwords from crashing SystemUI
* commit '
ba43413df15bcf0ed41b6ef837cb3e80e6df363b':
John Reck [Thu, 27 Aug 2015 09:05:46 +0000 (09:05 +0000)]
am
a531ddca: (-s ours) am
68fbd6a4: Merge "Use process state to filter >= UI_HIDDEN" into mnc-dev
* commit '
a531ddcad9a02c657d36081a397e17c19f10bf1c':
Adrian Roos [Thu, 27 Aug 2015 09:05:29 +0000 (09:05 +0000)]
am
29793dd4: (-s ours) am
4629f1c5: Merge "Fix janky add guest transition" into mnc-dev
* commit '
29793dd4ad199698735adaf4fec321fe13d5278e':
Andreas Gampe [Thu, 27 Aug 2015 09:05:03 +0000 (09:05 +0000)]
am
7d33ecc1: (-s ours) am
9a755e36: Merge "Frameworks/base: Hand fingerprint to ART" into mnc-dev
* commit '
7d33ecc147f0476fbe9c229faf06becabfb3e8fe':
Robert Greenwalt [Thu, 27 Aug 2015 09:04:28 +0000 (09:04 +0000)]
am
59ddd576: (-s ours) am
f0bead28: Merge "DO NOT MERGE Enhance local log." into mnc-dev
* commit '
59ddd576ebe60ebc5d5514fc515ea3523ac4dbea':
Amith Yamasani [Thu, 27 Aug 2015 09:03:44 +0000 (09:03 +0000)]
am
69259b13: (-s ours) am
2c5aeeaa: Merge "Require permission for internal broadcast" into mnc-dev
* commit '
69259b13fd750cd0666880fe27cb9400307ca09a':
Fyodor Kupolov [Thu, 27 Aug 2015 09:03:04 +0000 (09:03 +0000)]
am
5ddefc17: (-s ours) am
a5e25f33: Merge "Added ACCESS_COARSE_LOCATION permission for BT" into mnc-dev
* commit '
5ddefc174cd58487dfd7079b0f4c39bf19db4ae4':
Andrei Stingaceanu [Thu, 27 Aug 2015 09:02:40 +0000 (09:02 +0000)]
am
da905717: (-s ours) am
45794910: Merge "Disallow dragging text in extracted mode" into mnc-dev
* commit '
da90571750c15da557c9f807fe86f9a09ce9e473':
Julia Reynolds [Thu, 27 Aug 2015 09:02:26 +0000 (09:02 +0000)]
am
71a7651a: (-s ours) am
ea00f320: Merge "Prevent lockscreen album art from flickering on metadata change." into mnc-dev
* commit '
71a7651abd4d6408480817088b579f9114aa6e5c':
Jim Miller [Thu, 27 Aug 2015 09:02:10 +0000 (09:02 +0000)]
am
a8bc790a: (-s ours) am
abd35bfc: Merge "Add FEATURE_FINGERPRINT to PackageManager\'s feature list" into mnc-dev
* commit '
a8bc790a60a23ce281d59d8f3d34f6fde70c8242':
Ying Wang [Thu, 27 Aug 2015 09:01:53 +0000 (09:01 +0000)]
am
25e10e35: (-s ours) am
802da28f: am
430c8c3e: Merge "Add phony source target in the generated dependency file of aidl."
* commit '
25e10e353d3532cf6780145b6b4979f6b3855c09':
Jean-Michel Trivi [Thu, 27 Aug 2015 09:01:29 +0000 (09:01 +0000)]
am
e14a2f33: (-s ours) am
7b996853: Merge "MediaPlayer subtitle controller: use debug log instead of warning" into mnc-dev
* commit '
e14a2f3355328f13d12b70e372120022bba9df9f':
John Reck [Thu, 27 Aug 2015 09:00:56 +0000 (09:00 +0000)]
am
549dfccc: (-s ours) am
6b66a4a8: use findProcess instead of getProcess
* commit '
549dfccc35ebf4b27eac9419eb451c6040c97bf2':
Amit Mahajan [Thu, 27 Aug 2015 09:00:11 +0000 (09:00 +0000)]
am
83c7c06d: (-s ours) am
eea9892d: Merge "UICC : discard language setting of SIM" into mnc-dev
* commit '
83c7c06d05176390033290d1f7a07a4064239fd2':
Adrian Roos [Thu, 27 Aug 2015 08:59:23 +0000 (08:59 +0000)]
am
30a03425: (-s ours) am
0063e0bc: Merge "Disable Keyguard affordances before setup is completed" into mnc-dev
* commit '
30a03425b256a466da5c3d364b157f9af509f3dc':
Svetoslav Ganov [Thu, 27 Aug 2015 08:58:44 +0000 (08:58 +0000)]
am
056b71c0: (-s ours) am
28762e61: Merge "Keep default permission grants uninstalling a sys package upgrade" into mnc-dev
* commit '
056b71c05fd92cb0b323a0b185ca74487b03aabb':
John Reck [Thu, 27 Aug 2015 08:58:27 +0000 (08:58 +0000)]
am
1f4b21b9: (-s ours) am
8b1154c4: Merge "Move updateMatrix() call to animateCommon" into mnc-dev
* commit '
1f4b21b94c913592135b7ed0e869780723c49040':
Deepanshu Gupta [Thu, 27 Aug 2015 08:58:11 +0000 (08:58 +0000)]
am
fe4ff64a: (-s ours) am
f199ac84: Merge "Set support flag for custom layouts for RecyclerView." into mnc-dev
* commit '
fe4ff64a3b9dac56ec02a1a3d51b88576e73a43b':
Yohei Yukawa [Thu, 27 Aug 2015 08:57:48 +0000 (08:57 +0000)]
am
0e235f47: (-s ours) am
0526ee52: Merge "Don\'t rely on broadcast intent for waking up input method." into mnc-dev
* commit '
0e235f47530b3fefe84967a682646f9e28e9e717':
Deepanshu Gupta [Thu, 27 Aug 2015 08:57:09 +0000 (08:57 +0000)]
am
b8719e27: (-s ours) am
49fcfdd4: Merge changes I9c294329,Ie4db5d28 into mnc-dev
* commit '
b8719e27eb8d2fe289fb91055c6fae6c91c24211':
Deepanshu Gupta [Thu, 27 Aug 2015 08:56:37 +0000 (08:56 +0000)]
am
a6d25c84: (-s ours) am
f33c0f85: Merge "CalendarView rendering: use R.styleable to find attr." into mnc-dev
* commit '
a6d25c84cd2c8028970af3c60d58ca426058cb7d':
Stephen Hines [Thu, 27 Aug 2015 08:56:12 +0000 (08:56 +0000)]
am
b3a1674a: (-s ours) am
ed3ffe0f: am
6430812a: Merge "RenderScript: implement a Script entry point for calling a reduce-style kernel."
* commit '
b3a1674a47f8671f0e35e63c8d2ba7b3b73abc59':
Tim Kilbourn [Thu, 27 Aug 2015 08:55:58 +0000 (08:55 +0000)]
am
43250dd3: (-s ours) am
a2bf7616: Merge "Add a wm command to dismiss the keyguard." into mnc-dev
* commit '
43250dd37f1843f1e0a8ff19aaae287a41f3094b':
Svetoslav Ganov [Thu, 27 Aug 2015 08:55:44 +0000 (08:55 +0000)]
am
29e3f766: (-s ours) am
607bc34f: Merge "Reset permissions and app links when clearing app preferences - framework" into mnc-dev
* commit '
29e3f766697c362e79b2d629812f9f17b1c559e0':
Svetoslav Ganov [Thu, 27 Aug 2015 08:55:31 +0000 (08:55 +0000)]
am
bb8bdd71: (-s ours) am
258e630a: Merge "Shut down UiAutomationConnection without a lock held" into mnc-dev
* commit '
bb8bdd71683140558fa39718b43900758af9f7cd':
Tim Kilbourn [Thu, 27 Aug 2015 08:55:13 +0000 (08:55 +0000)]
am
99bad6f0: (-s ours) am
cc855ad7: Merge "Properly synchronize interactivity state." into mnc-dev
* commit '
99bad6f0c7070127888bb2f37966ebe732d4c2d1':
Jason Monk [Thu, 27 Aug 2015 08:54:49 +0000 (08:54 +0000)]
am
dbb0f24c: (-s ours) am
157ad64d: Merge "Fix emergency only when no sims" into mnc-dev
* commit '
dbb0f24cd0f62e4019edd1a474f295975bd7a1d2':
Julia Reynolds [Thu, 27 Aug 2015 08:54:19 +0000 (08:54 +0000)]
am
621b4870: (-s ours) am
c2df1ab4: Merge "Set \'the\' media notification to the notification actually playing." into mnc-dev
* commit '
621b48700365f5f93e5b9736b4a5508f235e7bac':
Jorim Jaggi [Thu, 27 Aug 2015 08:53:50 +0000 (08:53 +0000)]
am
09596431: (-s ours) am
1d071ce9: Make sure expandingFinished gets called when going into QS
* commit '
09596431d08fc275432d69a5b5738bcd42aa7428':
Kenny Root [Thu, 27 Aug 2015 08:53:33 +0000 (08:53 +0000)]
am
3b5b9c73: (-s ours) Merge branch \'mnc-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into mnc-dev-plus-aosp
* commit '
3b5b9c73d034dae25ec537edfbdea60f273d3c46':
Wenchao Tong [Thu, 27 Aug 2015 08:53:18 +0000 (08:53 +0000)]
am
1839b107: (-s ours) am
bf3a24d5: Merge "Ignore the active network scorer when checking for idleness" into mnc-dev
* commit '
1839b107acb0a9432d80a3521fd54cc3c3c63e6a':
John Reck [Thu, 27 Aug 2015 08:53:05 +0000 (08:53 +0000)]
am
b9ce7374: (-s ours) am
2abf0f24: Fix a race condition that could cause lockup
* commit '
b9ce737499ceb9a1e9f1d66140fe842b8a8bcc45':
Amith Yamasani [Thu, 27 Aug 2015 08:52:46 +0000 (08:52 +0000)]
am
ba3aa080: (-s ours) am
b3e40760: Merge "Avoid a deadlock between PMS and AppOpsService" into mnc-dev
* commit '
ba3aa0808f2536ccde9171e2396cf68bf0833013':
Alex Klyubin [Thu, 27 Aug 2015 08:52:33 +0000 (08:52 +0000)]
am
85e0511b: (-s ours) am
304b01c2: Merge "Document what algorithms Android Keystore supports." into mnc-dev
* commit '
85e0511b5fee8c93a4e70f9a6a3975253b5dc2da':
Junda Liu [Thu, 27 Aug 2015 08:52:10 +0000 (08:52 +0000)]
am
59ae2da6: (-s ours) am
859551f7: Merge "Remove volte_feature_disabled as carrier config handled it." into mnc-dev
* commit '
59ae2da69838daac8cc615733bb95626e8eeb268':
Jean-Michel Trivi [Thu, 27 Aug 2015 08:51:40 +0000 (08:51 +0000)]
am
9e4253f1: (-s ours) am
7f9e9012: Merge "RingtoneManager: query results depend on caller permission" into mnc-dev
* commit '
9e4253f144b60a6baedfcf411b320eb2fc48b5f1':
Jack Yu [Thu, 27 Aug 2015 08:51:05 +0000 (08:51 +0000)]
am
8c8c82d1: (-s ours) am
e21722a3: Merge "Allow carriers to force disable ETWS/CMAS test messages." into mnc-dev
* commit '
8c8c82d15a1ad04313532be11cde6e9ede198c2a':
Geoff Mendal [Thu, 27 Aug 2015 08:50:39 +0000 (08:50 +0000)]
am
2a883052: (-s ours) am
13edc160: (-s ours) Import translations. DO NOT MERGE
* commit '
2a883052ded6872a42999a8d0bd1481cc4514897':
Nick Kralevich [Thu, 27 Aug 2015 08:50:31 +0000 (08:50 +0000)]
am
d1065992: (-s ours) am
06b93a48: Merge "Revert "UsbDeviceManager: fix b/
21429947 regression"" into mnc-dev
* commit '
d10659928a0821c8bcd899625b7985bf39b7e08a':
Svetoslav Ganov [Thu, 27 Aug 2015 08:50:23 +0000 (08:50 +0000)]
am
1d76cf00: (-s ours) am
492fc648: Merge "Grant record audio to system reco service by default" into mnc-dev
* commit '
1d76cf00d9a946ad5354afc7a8c5ede5c44a3dcd':
Adam Lesinski [Thu, 27 Aug 2015 08:50:15 +0000 (08:50 +0000)]
am
93c0be91: (-s ours) am
f90ed330: Merge "UsageStats: Reduce log spam during time change" into mnc-dev
* commit '
93c0be912c648c56b1a26c82eca6aa7bf2174d55':
Dianne Hackborn [Thu, 27 Aug 2015 08:50:07 +0000 (08:50 +0000)]
am
da56bea4: (-s ours) am
4a368659: Merge "Fix issue #
22414729: Checkin start clock time is different from hsitory reset time" into mnc-dev
* commit '
da56bea428f8e71fe8c0e23cb04c970fd8d39b99':
Adrian Roos [Thu, 27 Aug 2015 08:50:00 +0000 (08:50 +0000)]
am
a23076db: (-s ours) am
f2170644: Merge "Fix cut off charging indication in certain scripts" into mnc-dev
* commit '
a23076db7d48a856fca111cce485f9f36ce2b9fd':
Dianne Hackborn [Thu, 27 Aug 2015 08:49:51 +0000 (08:49 +0000)]
am
aa0d9387: (-s ours) am
5507bb41: Merge "Fix issue #
22653116: Google App crashing on NYT app" into mnc-dev
* commit '
aa0d93873d6dcceca1a83112f2067da36479cab4':
Svetoslav Ganov [Thu, 27 Aug 2015 08:49:40 +0000 (08:49 +0000)]
am
4b4aceb5: (-s ours) am
41a62e11: Merge "Do not show normal permissions in sideloading UI" into mnc-dev
* commit '
4b4aceb5a4d6186fd2c38ec884e96506fe0f2282':
Fyodor Kupolov [Thu, 27 Aug 2015 08:49:23 +0000 (08:49 +0000)]
am
522dd937: (-s ours) am
a0a71d8a: Merge "Fixed a typo" into mnc-dev
* commit '
522dd9373970e5ddcb0dc304113f5e752898c8bd':