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

Paul Mclean [Thu, 27 Aug 2015 19:37:15 +0000 (19:37 +0000)]

Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base

Paul Mclean [Thu, 27 Aug 2015 19:37:03 +0000 (19:37 +0000)]

am 0cd7284c: am 0c3c81ef: (-s ours) am af7748ef: Merge "Consider channel index masks when calculating channel counts." into mnc-dev

* commit '0cd7284cc0cb265c422762484541bdb279216237':

commit | commitdiff | tree

Doris Liu [Thu, 27 Aug 2015 19:37:03 +0000 (19:37 +0000)]

Merge "Internal cleanup for Animator framework"

commit | commitdiff | tree

Paul Mclean [Thu, 27 Aug 2015 19:36:52 +0000 (19:36 +0000)]

am a9b0ecda: am 9048088d: (-s ours) am c770b7a5: Merge "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test." into mnc-dev

* commit 'a9b0ecdaadfb6f970c7b9670a3e3f98eaac48939':

commit | commitdiff | tree

Alan Viverette [Thu, 27 Aug 2015 19:36:36 +0000 (19:36 +0000)]

am 4a541c3f: am ad853777: (-s ours) am c7f8133f: Merge "Update anchor background on the correct view in PopupWindow" into mnc-dev

* commit '4a541c3fa1a7a64c699155e187233c9a28851361':

commit | commitdiff | tree

Dianne Hackborn [Thu, 27 Aug 2015 19:36:15 +0000 (19:36 +0000)]

am 893f7a6f: am aa8daf78: (-s ours) am 6b0f1e78: Merge "Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult" into mnc-dev

* commit '893f7a6f84effe3d8598fdfaed19ee08edda1bab':

commit | commitdiff | tree

Chet Haase [Thu, 27 Aug 2015 19:36:00 +0000 (19:36 +0000)]

Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base

commit | commitdiff | tree

Chet Haase [Thu, 27 Aug 2015 19:35:46 +0000 (19:35 +0000)]

am 20b5c41a: am 26762506: (-s ours) am da493aa6: Merge "Avoid changing internal state of shared drawable" into mnc-dev

* commit '20b5c41ada35869790d9423525aaf9a72317cead':

commit | commitdiff | tree

Alan Viverette [Thu, 27 Aug 2015 19:35:36 +0000 (19:35 +0000)]

Merge "Expose password text to accessibility services, if requested"

commit | commitdiff | tree

Alan Treadway [Thu, 27 Aug 2015 19:35:23 +0000 (19:35 +0000)]

am 3f1c3098: am e4b8c760: (-s ours) am 190a88d2: Merge "Update documentation of DevicePolicyManager intents." into mnc-dev

* commit '3f1c3098d24d8351729c7932b89e3ff1a4b27632':

commit | commitdiff | tree

Michael Wright [Thu, 27 Aug 2015 19:35:08 +0000 (19:35 +0000)]

am bfb910fe: am 46b7af57: (-s ours) am d5a6df6d: Merge "Make the NullVibrator really null." into mnc-dev

* commit 'bfb910febbfd637f6f04aecc50183ad715e2256a':

commit | commitdiff | tree

Michael Wright [Thu, 27 Aug 2015 19:34:50 +0000 (19:34 +0000)]

am bb1c5fd7: am 7a125e45: (-s ours) am eb7e3d7e: Merge "Don\'t dispatch when non-interactive and the display is off." into mnc-dev

* commit 'bb1c5fd71708dc0cf8967db51170c3d9437cdba2':

commit | commitdiff | tree

Julia Reynolds [Thu, 27 Aug 2015 19:34:26 +0000 (19:34 +0000)]

am 4c2fb49a: am 24d7c503: (-s ours) am a3b5a612: Merge "Store ringer mode on entering DND mode so it can be restored on exit." into mnc-dev

* commit '4c2fb49a324e234a1dca7bab462ba93c4b7aec49':

commit | commitdiff | tree

Geoff Mendal [Thu, 27 Aug 2015 19:34:09 +0000 (19:34 +0000)]

am 9825ec9c: (-s ours) am 307be111: (-s ours) am 375c792c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '9825ec9ccdd3f52cf8a3e7fc92256333ab363896':

commit | commitdiff | tree

Mitchell Wills [Thu, 27 Aug 2015 19:33:57 +0000 (19:33 +0000)]

am 30633875: am 088c8de2: (-s ours) am d14c4844: Merge "Pass connection configuration when setting wifi info" into mnc-dev

* commit '3063387593a1f31e8ad03d0352df3315b6575266':

commit | commitdiff | tree

Yusuke Sato [Thu, 27 Aug 2015 19:33:40 +0000 (19:33 +0000)]

am 28cfabad: am e15a5871: (-s ours) am 61234dea: am bd4c482b: Merge "Clean up AssetManager::scanAndMergeZipLocked"

* commit '28cfabad3530a98aebe1166633adf9a4f2d33d0c':

commit | commitdiff | tree

Amit Mahajan [Thu, 27 Aug 2015 19:33:26 +0000 (19:33 +0000)]

am 80b62754: am 96e2975c: (-s ours) am be948f5a: Merge "Removing tethering overlay for mcc202-mnc05 (VF Greece)." into mnc-dev

* commit '80b62754598a5e94b00782e851fb0d5d1d3db85f':

commit | commitdiff | tree

Jim Miller [Thu, 27 Aug 2015 19:33:07 +0000 (19:33 +0000)]

am a2660d09: am a950fe0a: (-s ours) am 120fc2c7: Merge "Disable fingerprint when remotely reset by DPM" into mnc-dev

* commit 'a2660d09221c72967fb8b0e07d01c0dfdb052f37':

commit | commitdiff | tree

Yorke Lee [Thu, 27 Aug 2015 19:32:45 +0000 (19:32 +0000)]

am c8cd404d: am 3d98e175: (-s ours) am f0affc6d: Merge "Correctly hide setConnectionService" into mnc-dev

* commit 'c8cd404d33f5368a3a0db372acf0024de4ed0f48':

commit | commitdiff | tree

Yusuke Sato [Thu, 27 Aug 2015 19:32:23 +0000 (19:32 +0000)]

am 48f597c8: am c1efd41f: (-s ours) Fix build breakage caused by I5ebe0438019958d883a7fda6bd92ea4484211d23 (AOSP)

* commit '48f597c8043a46ed1098612f696fa224428f975a':
Fix build breakage caused by I5ebe0438019958d883a7fda6bd92ea4484211d23 (AOSP)

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 19:32:02 +0000 (19:32 +0000)]

am 21a9d14e: am 63cd28af: (-s ours) am 2c1a22d9: Merge changes I85106f37,I7db398aa into mnc-dev

* commit '21a9d14e4f11d8170410e242f541039c1d76cdbb':

commit | commitdiff | tree

Paul Mclean [Thu, 27 Aug 2015 19:31:42 +0000 (19:31 +0000)]

am ecc21222: am f89aedbf: (-s ours) am 8eaf18b0: Merge "Documenting behavior of returning a 0-length array for formats, channels, rates queries for analog devices." into mnc-dev

* commit 'ecc212228a15d493d756b37820b9118fd0f01eb9':

commit | commitdiff | tree

Phil Burk [Thu, 27 Aug 2015 19:31:20 +0000 (19:31 +0000)]

am c7f65fa9: am 047fe2a7: (-s ours) am 881cd155: Merge "MidiManager: use ConcurrentHashMap" into mnc-dev

* commit 'c7f65fa9579367ed62b0577a5e8877d2696a9b34':

commit | commitdiff | tree

Vladislav Kaznacheev [Thu, 27 Aug 2015 19:30:57 +0000 (19:30 +0000)]

am 361f6c48: am af0a6184: (-s ours) am 8cc00243: Merge "Keep OverScroller.SplineOverScroller state consistent." into mnc-dev

* commit '361f6c48529557e57e3d1dc2aa64998ca581968a':

commit | commitdiff | tree

Yusuke Sato [Thu, 27 Aug 2015 19:30:31 +0000 (19:30 +0000)]

am eb9ddfe3: am eb24da62: (-s ours) am 3383b141: am a024acb8: Merge "Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files"

* commit 'eb9ddfe34f3fc679367d9552d7f508b28057f6fd':

commit | commitdiff | tree

Yohei Yukawa [Thu, 27 Aug 2015 19:30:06 +0000 (19:30 +0000)]

am 6475f6ac: am 3c9ec351: (-s ours) am db221acc: Merge "Reduce log spam for the ease of debugging Bug 22857361." into mnc-dev

* commit '6475f6ac06410a04c6bdeb95e2e54d25ce457d0c':

commit | commitdiff | tree

Ajay Panicker [Thu, 27 Aug 2015 19:29:51 +0000 (19:29 +0000)]

am 6b72c433: am 7324b151: (-s ours) am cda6e878: Implement Bluetooth settings factory reset (2/5)

* commit '6b72c4339621bc2482df5b08e57a36e14f731aa5':

commit | commitdiff | tree

Svetoslav Ganov [Thu, 27 Aug 2015 19:29:35 +0000 (19:29 +0000)]

am fec8832c: am 69abbe45: (-s ours) am e72377e1: Merge "Fix app ops regressions introduced by the per UID policy change" into mnc-dev

* commit 'fec8832c8a8e95fd2d0253e3b1159079ec0cf8ca':

commit | commitdiff | tree

Mitchell Wills [Thu, 27 Aug 2015 19:29:16 +0000 (19:29 +0000)]

am 6e43c3bd: am 701a36d5: (-s ours) am bce3eb22: Merge "Fix incorrect default wifi power draw values" into mnc-dev

* commit '6e43c3bd1a1d0834a39641dd01a0c7b6671a733c':

commit | commitdiff | tree

Rubin Xu [Thu, 27 Aug 2015 19:29:04 +0000 (19:29 +0000)]

am 8fd6ef0f: am 16c4e75e: (-s ours) am ab868eff: Merge "Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE" into mnc-dev

* commit '8fd6ef0fcfd6ff9464e28808e3140a7a7c5ac334':

commit | commitdiff | tree

Makoto Onuki [Thu, 27 Aug 2015 19:28:47 +0000 (19:28 +0000)]

am 71c86de7: am fe6964e4: (-s ours) am 86ee3a57: Merge "READ_SMS allows getLine1Number() [1/3]" into mnc-dev

* commit '71c86de737b9490328c564ef1b957213fe6af518':

commit | commitdiff | tree

Niels Egberts [Thu, 27 Aug 2015 19:28:36 +0000 (19:28 +0000)]

am a1251eed: am 94b5278e: (-s ours) am 6bdc4637: Merge "NPE occured when trying to parcel voice features." into mnc-dev

* commit 'a1251eed7233979f6522d69bead91a5f2f669342':

commit | commitdiff | tree

Ian Pedowitz [Thu, 27 Aug 2015 19:28:21 +0000 (19:28 +0000)]

am 6fef40bd: am df27f4b4: (-s ours) am df5a6611: Merge "Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""" into mnc-dev

* commit '6fef40bd2628e38744fc4be4a9409be4516d2dac':

commit | commitdiff | tree

Paul Jensen [Thu, 27 Aug 2015 19:28:10 +0000 (19:28 +0000)]

am 5f78a07b: am 66625ff1: (-s ours) am dbc4edcc: Merge "Fix NOT_RESTRICTED network capability and enforce it." into mnc-dev

* commit '5f78a07bd94d3f7824eac0caa383d8d21d9b8af8':

commit | commitdiff | tree

Roozbeh Pournader [Thu, 27 Aug 2015 19:27:58 +0000 (19:27 +0000)]

am de7d268e: am e32d00aa: (-s ours) am 519adb50: Merge "Create a special CONSTRAINED font bucket in frameworks." into mnc-dev

* commit 'de7d268eadd7d1397567ce147f076ea9e16fdc92':

commit | commitdiff | tree

xin He [Thu, 27 Aug 2015 19:27:48 +0000 (19:27 +0000)]

am ecd86797: am 5e5ac5d8: (-s ours) am 54cea234: Merge "Boot loop when SSID has non UTF-8 character in the name" into mnc-dev

* commit 'ecd86797691d95ed297a1f8a25408e597f670c89':

commit | commitdiff | tree

Jae Seo [Thu, 27 Aug 2015 19:27:37 +0000 (19:27 +0000)]

am 66fb4bcb: am ea0483c4: (-s ours) am 2094a702: Merge "Unregister the existing callback when MediaProjection stops" into mnc-dev

* commit '66fb4bcb5e7213ac8af8005c9190153fb79e9a50':

commit | commitdiff | tree

Jeff Sharkey [Thu, 27 Aug 2015 19:27:25 +0000 (19:27 +0000)]

am 94f8f931: am b6117765: (-s ours) am 0d616883: Merge "Fix moving of apps into legacy ASEC." into mnc-dev

* commit '94f8f9318fdf70e7964348d832b64d786e60a4f7':

commit | commitdiff | tree

Filip Gruszczynski [Thu, 27 Aug 2015 19:27:12 +0000 (19:27 +0000)]

am ef9afd2f: am cae230a4: (-s ours) am 52d3312a: Merge "Make ResourceKey always use non-null configuration override." into mnc-dev

* commit 'ef9afd2fa1d933ce187d1bfc6fa723e881fad6af':

commit | commitdiff | tree

Mitchell Wills [Thu, 27 Aug 2015 19:26:55 +0000 (19:26 +0000)]

am 500dd6c3: am bb4fd900: (-s ours) am 385dfd34: Merge "Charge apps for wifi tx time while scanning" into mnc-dev

* commit '500dd6c31ea0eeeb198016c6493ba1f6a9d73bcf':

commit | commitdiff | tree

Roshan Pius [Thu, 27 Aug 2015 19:26:40 +0000 (19:26 +0000)]

am 08e05b35: am 49193063: (-s ours) am 78b8d4aa: Mark missed calls as read in calllog restore(2/2)

* commit '08e05b351ee6625f1ff4fc4e045f7ce61107258f':

commit | commitdiff | tree

John Reck [Thu, 27 Aug 2015 19:26:20 +0000 (19:26 +0000)]

am f7be4726: am 17dafd60: (-s ours) am 906c8dea: am bc04d3ac: Merge "animateNoDamage failed to remove from current frame list"

* commit 'f7be4726083f7df4ba1acdd65fbc0e0b89d635ad':

commit | commitdiff | tree

Jean-Michel Trivi [Thu, 27 Aug 2015 19:26:09 +0000 (19:26 +0000)]

am ad895fe9: am b98166c6: (-s ours) am fc5a4bf0: Merge "AudioService: check for audio device connection success" into mnc-dev

* commit 'ad895fe9c8649601aeabbb4f05ef5f6a8805cc4a':

commit | commitdiff | tree

John Reck [Thu, 27 Aug 2015 19:25:59 +0000 (19:25 +0000)]

am 09bdc9af: am 666f3194: (-s ours) am 2fa3eec0: am 93c14069: Merge "hwui: add extension to support unpack operations in OpenGL ES 2.0"

* commit '09bdc9af6f5f300ac2b0377bb8af0b90f811a345':

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 19:12:30 +0000 (19:12 +0000)]

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

* commit '34fbe1015501bb90478b45f3d87884a83c2533db':

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Vadim Tryshev [Thu, 27 Aug 2015 19:11:36 +0000 (19:11 +0000)]

Merge "Removing profile's pinned apps upon a profile removal."

commit | commitdiff | tree

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

commit | commitdiff | tree

Dianne Hackborn [Thu, 27 Aug 2015 19:10:53 +0000 (19:10 +0000)]

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

* commit '0c5c96cb91d3ee76d38c775ec49b1abc43c23d97':

commit | commitdiff | tree

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