git.osdn.net Git - android-x86/frameworks-base.git/log

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 09:44:29 +0000 (09:44 +0000)]

am df45e1b2: (-s ours) am e836a229: Fix build.

* commit 'df45e1b27d8eeeece9f95b6d80dab059297d1a60':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

Dianne Hackborn [Thu, 27 Aug 2015 09:43:24 +0000 (09:43 +0000)]

am e07a0602: (-s ours) am 692a244b: Fix build.

* commit 'e07a060298c96d949de7bf61d20e091bc974a081':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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.

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

Jorim Jaggi [Thu, 27 Aug 2015 09:30:13 +0000 (09:30 +0000)]

am f5893c0b: (-s ours) am 95c6daed: Fix doze mode

* commit 'f5893c0b72b8c4bdd54f38ee8af5f55f3b975ef9':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':