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

Jorim Jaggi [Thu, 27 Aug 2015 10:36:47 +0000 (10:36 +0000)]

am f7875f80: (-s ours) am 757e2c7f: Merge "Fix documentation issue" into mnc-dev

* commit 'f7875f806f47b9c830c6e9ae3b3b84d1949750fd':

commit | commitdiff | tree

Elliott Hughes [Thu, 27 Aug 2015 10:36:40 +0000 (10:36 +0000)]

am bda7780d: (-s ours) am 12cf0f9c: am eba23aaa: Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools."

* commit 'bda7780daedf017b46da61610ea4c0fa93e8d82c':

commit | commitdiff | tree

Joe Fernandez [Thu, 27 Aug 2015 10:36:32 +0000 (10:36 +0000)]

am 1090412f: (-s ours) am 46ae218b: Merge "docs: Support Library v23 updates" into mnc-dev

* commit '1090412f6019528fe2a314d69868449ca02397c7':

commit | commitdiff | tree

Dirk Dougherty [Thu, 27 Aug 2015 10:36:24 +0000 (10:36 +0000)]

am ce17f53e: (-s ours) am bd58d6fc: Doc change: misc fixes for preview 3.

* commit 'ce17f53ecd9cf01b5bb2bb21a17a5cae1601e026':

commit | commitdiff | tree

Junda Liu [Thu, 27 Aug 2015 10:36:14 +0000 (10:36 +0000)]

am 261ef07b: (-s ours) am f2cb6f7e: Merge "Grant SMS carrier provisioning app the permission to receive SMS." into mnc-dev

* commit '261ef07b6f5c324e809d40d4e87786fb83f9644a':

commit | commitdiff | tree

Chris Tate [Thu, 27 Aug 2015 10:36:00 +0000 (10:36 +0000)]

am 44bb9629: (-s ours) am a3fd27ad: Merge "Check component permissions like \'exported\' before assigned permissions" into mnc-dev

* commit '44bb96291f37ed1315044b9d2946a9916e65b4fd':

commit | commitdiff | tree

Quddus Chong [Thu, 27 Aug 2015 10:35:50 +0000 (10:35 +0000)]

am 490d6b5d: (-s ours) am a03567bf: docs: Fixed unclosed anchor tag for M Program Overview.

* commit '490d6b5ddf92918b2962d1300ca7d8a9681e23f3':

commit | commitdiff | tree

Andrew Solovay [Thu, 27 Aug 2015 10:35:35 +0000 (10:35 +0000)]

am ad7d95bd: (-s ours) am af46e1b4: resolved conflicts for merge of 44053b4e to mnc-dev

* commit 'ad7d95bdcf849d9a13c0ff021beb1c7692e419ea':

commit | commitdiff | tree

Quddus Chong [Thu, 27 Aug 2015 10:35:22 +0000 (10:35 +0000)]

am dbfa65dd: (-s ours) am ed7961eb: Merge "docs: Fixed typo in Android for Work section in MNC Behavior Changes doc." into mnc-dev

* commit 'dbfa65ddb2b76b49541d5d084c32d5fc7f8f141b':

commit | commitdiff | tree

Eric Gilmore [Thu, 27 Aug 2015 10:35:12 +0000 (10:35 +0000)]

am ffc3da39: (-s ours) am 9b3c0bc9: am 398d655f: am d381eb95: Merge "Adding link to location API video." into mnc-preview-docs

* commit 'ffc3da39d66a35b23207fd4afe85dc2fa535ec84':

commit | commitdiff | tree

Rich Sloager [Thu, 27 Aug 2015 10:34:53 +0000 (10:34 +0000)]

am 67ff0c99: (-s ours) am 7f328d98: am 08b3f121: am 72c1f222: Merge "docs: studio 1.3.1 revision updates" into mnc-preview-docs

* commit '67ff0c9998884d6a492395b897cae240f6c810cb':

commit | commitdiff | tree

Rich Sloager [Thu, 27 Aug 2015 10:34:40 +0000 (10:34 +0000)]

am 9adb76b9: (-s ours) am 50a16111: am 285c9cb7: am 4f66c1da: Merge "docs: studio 1.3.1 download updates" into mnc-preview-docs

* commit '9adb76b961b99462a643529338fc4084b06907ba':

commit | commitdiff | tree

Cheryl Potter [Thu, 27 Aug 2015 10:34:28 +0000 (10:34 +0000)]

am 36bde447: (-s ours) am a5913fbb: am a2f11f81: am caec50ec: docs: changed version 5 to 3 for Billing API

* commit '36bde447f94a089acc70bdfaef089d7fc7f57707':

commit | commitdiff | tree

Quddus Chong [Thu, 27 Aug 2015 10:34:15 +0000 (10:34 +0000)]

am 2ad15414: (-s ours) am 3f90a43c: am 98d2d0d5: am 862f0f03: doc: Updated Auto quality guideline for media playback (AU-MT). The update reflects new guidance that media apps do not autoplay on startup of Android Auto or without user initiated action to select th

* commit '2ad1541452f4e41e48fb06993f443bb82504cd08':

commit | commitdiff | tree

Rich Sloager [Thu, 27 Aug 2015 10:34:03 +0000 (10:34 +0000)]

am 49a84760: (-s ours) am 96b2c10d: am 55ee752e: am c5b58011: Merge "docs: gradle plugin revision update" into mnc-preview-docs

* commit '49a84760f93337d861abbee06d070936be3c50cb':

commit | commitdiff | tree

Joe Fernandez [Thu, 27 Aug 2015 10:33:45 +0000 (10:33 +0000)]

am f2032ec7: (-s ours) am f71cc012: am 9186895b: am 5fd0eff1: docs: August 2015 Android Dashboard update

* commit 'f2032ec76259acbdd8a4bbc028146dce00586469':

commit | commitdiff | tree

Rich Sloager [Thu, 27 Aug 2015 10:33:34 +0000 (10:33 +0000)]

am c998eb70: (-s ours) am d00a5b1b: am 998f5501: am 378a3a89: Merge "docs: studio 1.3 annotation-update" into mnc-preview-docs

* commit 'c998eb708b6c411ab4ad7db6da2af6a700eac3a6':

commit | commitdiff | tree

Rich Slogar [Thu, 27 Aug 2015 10:33:24 +0000 (10:33 +0000)]

am d71a5829: (-s ours) am 43c8a1c8: am 3ee95327: am 6c00399c: docs: studio 1.3 private resources

* commit 'd71a5829d792e6cd0a1497838e7cbecbd3b75a8b':

commit | commitdiff | tree

Rich Slogar [Thu, 27 Aug 2015 10:33:08 +0000 (10:33 +0000)]

am 3d7e0b42: (-s ours) am 1614f115: am 8f0d5451: am e5fe2468: docs: studio 1.3 allocation tracker

* commit '3d7e0b426acec17e6efdaa8cd25ba0ce7053755d':

commit | commitdiff | tree

Rich Slogar [Thu, 27 Aug 2015 10:32:59 +0000 (10:32 +0000)]

am 04a72e87: (-s ours) am 605c890b: am 860e65be: am 16c5726e: docs: studio 1.3 developer services

* commit '04a72e87739d3b19db26e4fabcbd7d608e66acd5':

commit | commitdiff | tree

Rich Sloager [Thu, 27 Aug 2015 10:32:51 +0000 (10:32 +0000)]

am 5cadd055: (-s ours) am 30996739: am e62df60a: am b90583ac: Merge "docs: create-project-link in studio overview" into mnc-preview-docs

* commit '5cadd055982cfdd8ca82f138ca3e5db35dae9b50':

commit | commitdiff | tree

Rich Sloager [Thu, 27 Aug 2015 10:32:39 +0000 (10:32 +0000)]

am 17769abf: (-s ours) am c6bfe586: am ccd0fe27: am c87ca50a: Merge "docs: studio 1.3 downloads" into mnc-preview-docs

* commit '17769abfdd178eaa533917744f4a3c9c8f41e2fe':

commit | commitdiff | tree

Rich Sloager [Thu, 27 Aug 2015 10:32:29 +0000 (10:32 +0000)]

am ece6e5f7: (-s ours) am 0ac81a6e: am fd8da61a: am f0cd0441: Merge "docs: studio 1.3 manifest merger update" into mnc-preview-docs

* commit 'ece6e5f77d2d9653b51e61ea6fec0f7e91020d8e':

commit | commitdiff | tree

Rich Sloager [Thu, 27 Aug 2015 10:32:18 +0000 (10:32 +0000)]

am 4803a668: (-s ours) am 3cff3688: am 371ccd13: am 51c02f6a: Merge "docs: studio 1.3 revisions - android plugin for gradle" into mnc-preview-docs

* commit '4803a6687acff85f59f350a15795d576fde7549b':

commit | commitdiff | tree

Rich Sloager [Thu, 27 Aug 2015 10:32:07 +0000 (10:32 +0000)]

am 77a70b12: (-s ours) am 110a5574: am f82f33d3: am 4c5b6cc4: Merge "docs: studio 1.3 live templates" into mnc-preview-docs

* commit '77a70b12a642d81dd631fcb0e442d42dea052b08':

commit | commitdiff | tree

Rich Sloager [Thu, 27 Aug 2015 10:31:54 +0000 (10:31 +0000)]

am da5f10f4: (-s ours) am 7026df3b: am 5f8d3728: am b8987585: Merge "docs: studio 1.3 revisions - studio" into mnc-preview-docs

* commit 'da5f10f41fa3d2c5dc01c165946c27df986f2178':

commit | commitdiff | tree

Rich Sloager [Thu, 27 Aug 2015 10:31:42 +0000 (10:31 +0000)]

am b614a7d9: (-s ours) am 7cbc35be: am c4fe8db7: am 322de02a: Merge "docs: studio 1.3 hprof viewer" into mnc-preview-docs

* commit 'b614a7d9042e8edb9c80dad4bafcd10c23555d8c':

commit | commitdiff | tree

Rich Sloager [Thu, 27 Aug 2015 10:31:30 +0000 (10:31 +0000)]

am b6f0aefc: (-s ours) am 1c6997b3: am 27b24602: am 47c88fca: Merge "docs: studio 1.3 separate test folder" into mnc-preview-docs

* commit 'b6f0aefcfd004bbbf2d743180255904df0a85477':

commit | commitdiff | tree

Rich Sloager [Thu, 27 Aug 2015 10:31:19 +0000 (10:31 +0000)]

am f2685d69: (-s ours) am ff7526c1: am 71178f02: am 29dfe902: Merge "docs: studio 1.3 fingerprint support" into mnc-preview-docs

* commit 'f2685d69bb9844b80f7964de2d1c582ce7e46f80':

commit | commitdiff | tree

Rich Sloager [Thu, 27 Aug 2015 10:31:01 +0000 (10:31 +0000)]

am 83c7d168: (-s ours) am b4e5608d: am 57cdc011: am 054711b6: Merge "docs: studio 1.3 sdk manager updates" into mnc-preview-docs

* commit '83c7d1689b6bcddd857770e7b4809c843b09ad76':

commit | commitdiff | tree

Rich Slogar [Thu, 27 Aug 2015 10:30:41 +0000 (10:30 +0000)]

am ee68db53: (-s ours) am 1beefcad: am 7a76e44d: am 1f6a5f89: docs: design support library 22.2.1 revisions

* commit 'ee68db5389317902d8a27ccd43b2d5505b5c5093':

commit | commitdiff | tree

Andrew Solovay [Thu, 27 Aug 2015 10:30:27 +0000 (10:30 +0000)]

am 24eabe83: (-s ours) am 8c6a2208: am 8a9972cc: am 803c5738: Merge "docs: Updated the list of auto partners, added links" into mnc-preview-docs

* commit '24eabe831a39a32831803f36eb0ccee690bfd177':

commit | commitdiff | tree

Esteban Talavera [Thu, 27 Aug 2015 10:30:14 +0000 (10:30 +0000)]

am acbb1a96: (-s ours) am 5d467ac5: Merge "Remove uids with empty history from NetworkStats uid enumeration" into mnc-dev

* commit 'acbb1a96348f3abd4520773c27ebebc5a6a40c30':

commit | commitdiff | tree

Chris Banes [Thu, 27 Aug 2015 10:29:55 +0000 (10:29 +0000)]

am 91ca3d71: (-s ours) am 4fd784e1: Merge "Add Support Lib v23 API Diff" into mnc-dev

* commit '91ca3d71d8f5d516c8620b76b46e15c9f7dcdfbd':

commit | commitdiff | tree

Joe Fernandez [Thu, 27 Aug 2015 10:29:44 +0000 (10:29 +0000)]

am a67a3924: (-s ours) am 70004d9f: docs: fix build errors due to linked apache http classes

* commit 'a67a39244cb7982b699b04d6641fac269ccd1142':

commit | commitdiff | tree

Quddus Chong [Thu, 27 Aug 2015 10:29:24 +0000 (10:29 +0000)]

am 770a8b4f: (-s ours) am 28f2ba8e: docs: Remove Google Play Services pages under Develop > Google Services.

* commit '770a8b4f1c61ecd5ee4c74a1880592c5e36020da':

commit | commitdiff | tree

Joe Fernandez [Thu, 27 Aug 2015 10:29:11 +0000 (10:29 +0000)]

am 2cfba6dc: (-s ours) am 85429c0d: docs: Android 5.1 API Release notes (Lollipop MR1)

* commit '2cfba6dc284a794ac9789a635c04ff499250c7d9':

commit | commitdiff | tree

Joe Fernandez [Thu, 27 Aug 2015 10:29:00 +0000 (10:29 +0000)]

am c4876464: (-s ours) am 637db47e: docs: SDK Tools v23.3.4 release download links

* commit 'c4876464a9f76f9eb8ecf22cce36b2f9f7e3c6f2':

commit | commitdiff | tree

Joe Fernandez [Thu, 27 Aug 2015 10:28:40 +0000 (10:28 +0000)]

am e6b2a1e9: (-s ours) am 0baf95bf: docs: SDK Tools Release notes for v24.3.4

* commit 'e6b2a1e9f0416f699908f9f3943c15c34ad8e42d':

commit | commitdiff | tree

Joe Fernandez [Thu, 27 Aug 2015 10:28:28 +0000 (10:28 +0000)]

am 882c34d2: (-s ours) am 472b6b44: docs: Platform release notes for Android 6.0 (API 23) revision 1

* commit '882c34d23999670dd7ceecbe67a446025f70ad2e':

commit | commitdiff | tree

Joe Fernandez [Thu, 27 Aug 2015 10:28:17 +0000 (10:28 +0000)]

am 83b1ad4a: (-s ours) am 6a3016d2: Merge "docs: Build Tools 23.0.0 release notes" into mnc-dev

* commit '83b1ad4a21a678b1251ff141681aae9ef7c220bd':

commit | commitdiff | tree

Joe Fernandez [Thu, 27 Aug 2015 10:28:01 +0000 (10:28 +0000)]

am a6262543: (-s ours) am bd4ed32f: docs: Preview 3 - Support page updates

* commit 'a6262543828e343cfeb69ad2ab07e109470e09d2':

commit | commitdiff | tree

Dirk Dougherty [Thu, 27 Aug 2015 10:27:51 +0000 (10:27 +0000)]

am ae6771e9: (-s ours) am 42c22d04: Merge "Doc change: Edits for final SDK and dev preview 3. Add selector to manage landing page image." into mnc-dev

* commit 'ae6771e9c3b822eef9184d94d5786b265feacc05':

commit | commitdiff | tree

Joe Fernandez [Thu, 27 Aug 2015 10:27:38 +0000 (10:27 +0000)]

am fdcd2637: (-s ours) am bf8f17f8: docs: Update Preview downloads page for Developer Preview 3

* commit 'fdcd2637eb09b5f4430930e3ac865b3960fd44a1':

commit | commitdiff | tree

Joe Fernandez [Thu, 27 Aug 2015 10:27:27 +0000 (10:27 +0000)]

am bee84879: (-s ours) am 5c7817bc: Merge "Update the RenderScript runtime documentation for MNC." into mnc-dev

* commit 'bee84879a90b73d1ccd59771fce19e9653cda071':

commit | commitdiff | tree

Dan Albert [Thu, 27 Aug 2015 10:27:10 +0000 (10:27 +0000)]

am 293b85ba: (-s ours) Merge "Fix pessimizing move." into mnc-dev-plus-aosp

* commit '293b85ba821affb4fb464324c8599e714bb42aed':
Fix pessimizing move.

commit | commitdiff | tree

Eino-Ville Talvala [Thu, 27 Aug 2015 10:26:59 +0000 (10:26 +0000)]

am c964884e: (-s ours) am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev

* commit 'c964884eb73cd1c903809bfa3393fbf51f38a133':

commit | commitdiff | tree

Quddus Chong [Thu, 27 Aug 2015 10:26:48 +0000 (10:26 +0000)]

am b22f33e8: (-s ours) am 6fa531e0: Merge "docs: Updated gms_lists.js for GMS v7.8 (Reblochon) Javadoc discovery." into mnc-dev

* commit 'b22f33e8fa07f10565515b301e60f99ea19e8b46':

commit | commitdiff | tree

Joe Fernandez [Thu, 27 Aug 2015 10:26:38 +0000 (10:26 +0000)]

am 398eeaaa: (-s ours) am fbf170cb: Merge "docs: API diff report 22 to 23" into mnc-dev

* commit '398eeaaaa6c693578349da1efd638e38a15b6132':

commit | commitdiff | tree

Andrew Solovay [Thu, 27 Aug 2015 10:26:28 +0000 (10:26 +0000)]

am d2acabba: (-s ours) am 886e382d: Merge "docs: Added Javadoc links for new M Preview permissions methods" into mnc-dev

* commit 'd2acabba35548495f1e16207b9ddc05c9eea4573':

commit | commitdiff | tree

David Friedman [Thu, 27 Aug 2015 10:26:19 +0000 (10:26 +0000)]

am c973ebac: (-s ours) am 5bd5c25e: Merge "Docs: Migration, rewrite of Doze/App Standby doc from M Preview behavior page Bug: 22947123" into mnc-dev

* commit 'c973ebac36668707f6cec3f60bcd08e615a41241':

commit | commitdiff | tree

Chris Craik [Thu, 27 Aug 2015 10:26:10 +0000 (10:26 +0000)]

am 090341d7: (-s ours) am 63d3a610: (-s ours) am e3f0a881: Merge "Make the value for shadowRadius less than 1.0 work"

* commit '090341d7e0b9147f05b29edb110bc6d35937e970':

commit | commitdiff | tree

Dianne Hackborn [Thu, 27 Aug 2015 10:26:01 +0000 (10:26 +0000)]

am b774ed20: (-s ours) am 06f552cf: Merge "Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo..." into mnc-dev

* commit 'b774ed20ec809cfb66a5e4cc43c452e8b43a9939':

commit | commitdiff | tree

Andrew Solovay [Thu, 27 Aug 2015 10:25:52 +0000 (10:25 +0000)]

am 3ed2a4e1: (-s ours) am eee09f49: Merge "cherrypick from mnc-preview-docs docs: Preview 3 permissions docs. Original Change-Id: I4eaf45d98846e2bf9456f5896da4ec3079f4ba18" into mnc-dev

* commit '3ed2a4e169cb5d676e768015216bf7f98db37e2f':

commit | commitdiff | tree

Dan Albert [Thu, 27 Aug 2015 10:25:38 +0000 (10:25 +0000)]

am f13f1efa: (-s ours) am 16e5aba9: am 4a2a890b: Merge "Fix mismatched new[]/delete."

* commit 'f13f1efab233b5b90c185b973665e5b675a6de53':

commit | commitdiff | tree

Adam Lesinski [Thu, 27 Aug 2015 10:25:27 +0000 (10:25 +0000)]

am 9a9fd61e: (-s ours) am 0cd143ad: Merge "AAPT: Fix regression in resource versioning" into mnc-dev

* commit '9a9fd61e0b4a93ef36b13e4ff00621dd594b96cb':

commit | commitdiff | tree

Quddus Chong [Thu, 27 Aug 2015 10:25:10 +0000 (10:25 +0000)]

am 930fa6d6: (-s ours) am b8fb239a: Merge "docs: Updated API Overview and Behavior Changes docs for M Preview 3." into mnc-dev

* commit '930fa6d6f640452ff57986587e5e37f49d49fd4e':

commit | commitdiff | tree

Daniel Sandler [Thu, 27 Aug 2015 10:24:59 +0000 (10:24 +0000)]

am 72c982fa: (-s ours) am 9f238a94: Merge "Introducing M Land." into mnc-dev

* commit '72c982fa247100e845f1ebe1f8b59eae84e9e504':

commit | commitdiff | tree

Daniel Sandler [Thu, 27 Aug 2015 10:24:40 +0000 (10:24 +0000)]

am fa42d28f: (-s ours) am 8ad3e817: Merge ""I tried to think of the most harmless thing."" into mnc-dev

* commit 'fa42d28f60095d49ef4361c1b21b0e970332e2b9':

commit | commitdiff | tree

Adam Lesinski [Thu, 27 Aug 2015 10:24:29 +0000 (10:24 +0000)]

am 4fe0a446: (-s ours) am 504600bb: Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc-dev

* commit '4fe0a44658461cd35df0f85f03bea1c6ee1e9d37':

commit | commitdiff | tree

Julia Reynolds [Thu, 27 Aug 2015 10:24:18 +0000 (10:24 +0000)]

am 9eec1c2a: (-s ours) am 7df411d0: Merge "Clear calling identity before getting the current user." into mnc-dev

* commit '9eec1c2aa5353f0ec6001cf40632faf50f40ea55':

commit | commitdiff | tree

Jean-Michel Trivi [Thu, 27 Aug 2015 10:24:08 +0000 (10:24 +0000)]

am 2f160d38: (-s ours) am 16fa58cb: Merge "Fix to check the incoming userid argument for RingtonePlayer" into mnc-dev

* commit '2f160d38c02275150864afaf2649949a00234209':

commit | commitdiff | tree

Chris Tate [Thu, 27 Aug 2015 10:23:59 +0000 (10:23 +0000)]

am d7a164bf: (-s ours) am 7e7d79ef: Merge "Make "Ask every time" actually work that way" into mnc-dev

* commit 'd7a164bf3ff67a9c37e9879c333e79aacc991e1b':

commit | commitdiff | tree

Dianne Hackborn [Thu, 27 Aug 2015 10:23:49 +0000 (10:23 +0000)]

am 3ffc0f1e: (-s ours) am 81f3a85a: Merge "Fix issue #22940169: "pm grant" can no longer grant permissions..." into mnc-dev

* commit '3ffc0f1e81f6a45190cd928759e728ecbdfaf0b9':

commit | commitdiff | tree

Svetoslav Ganov [Thu, 27 Aug 2015 10:23:39 +0000 (10:23 +0000)]

am 03e64e4e: (-s ours) am b045331f: Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev

* commit '03e64e4edd8fc32fa04a4ca8dfc3184129281a55':

commit | commitdiff | tree

Jeff Sharkey [Thu, 27 Aug 2015 10:23:29 +0000 (10:23 +0000)]

am b53738f7: (-s ours) am cfcf6af9: Merge "Method to show DialogFragment allowing state loss." into mnc-dev

* commit 'b53738f71e80760394df1825ee94a60ce9dcca4b':

commit | commitdiff | tree

Joe Fernandez [Thu, 27 Aug 2015 10:23:20 +0000 (10:23 +0000)]

am 619bbdf4: (-s ours) am 37dd5240: Merge "Doc change: Update preview pages for dp3." into mnc-dev

* commit '619bbdf4a9b22294be8b0a685e1f41b4a10a7127':

commit | commitdiff | tree

Jorim Jaggi [Thu, 27 Aug 2015 10:23:11 +0000 (10:23 +0000)]

am 8de9d445: (-s ours) am 81eeef58: Merge "Update time when turning on screen, in addition to waking up" into mnc-dev

* commit '8de9d4458347a00333a340e1400a0ef0fe7da9ab':

commit | commitdiff | tree

Joe Fernandez [Thu, 27 Aug 2015 10:23:01 +0000 (10:23 +0000)]

am c245093f: (-s ours) am f7557729: Merge "docs: Update uses-sdk-element page with API 23 (M) listing" into mnc-dev

* commit 'c245093f96856c702779d741e7043b847cdc4c22':

commit | commitdiff | tree

Joe Fernandez [Thu, 27 Aug 2015 10:22:47 +0000 (10:22 +0000)]

am 9f65f0a2: (-s ours) am 8d149d7f: Merge "docs: Update developer docs make file to include API 23" into mnc-dev

* commit '9f65f0a2c00871fd5fa74e241d46ca65a7d3b40f':

commit | commitdiff | tree

Mike Dodd [Thu, 27 Aug 2015 10:22:36 +0000 (10:22 +0000)]

am 93eef423: (-s ours) am 226ae04d: Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev

* commit '93eef42349133b5857f538f4ea6278ba561fd536':

commit | commitdiff | tree

Jason Monk [Thu, 27 Aug 2015 10:22:17 +0000 (10:22 +0000)]

am 692e9b34: (-s ours) am 90460c79: Merge "Add more intelligence to bluetooth connection state" into mnc-dev

* commit '692e9b3404a2ba2260fa50668fbbc76d8c874f21':

commit | commitdiff | tree

Bart Sears [Thu, 27 Aug 2015 10:22:02 +0000 (10:22 +0000)]

am 48ce6d27: (-s ours) am bd29b07e: Merge "Fix Keyguard drawn timeout" into mnc-dev

* commit '48ce6d27015fa40291ed1aa4fcf414c3cb6fa818':

commit | commitdiff | tree

Dianne Hackborn [Thu, 27 Aug 2015 10:21:50 +0000 (10:21 +0000)]

am 6d52d761: (-s ours) am ff9912d5: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev

* commit '6d52d7616d339801af6caad77bc50df16df7a813':

commit | commitdiff | tree

Jeff Sharkey [Thu, 27 Aug 2015 10:21:33 +0000 (10:21 +0000)]

am 25919834: (-s ours) am c97509c0: Merge "Update ifaces when global restriction changes." into mnc-dev

* commit '259198343bce24500d4abbf063ea579772b5ebb9':

commit | commitdiff | tree

Nick Kralevich [Thu, 27 Aug 2015 10:21:18 +0000 (10:21 +0000)]

am 715bb2f6: (-s ours) am f3ae2603: am 10e0f079: Merge "SELinuxPolicyInstallReceiver: Switch to file_contexts.bin."

* commit '715bb2f64b22e81e65c0f2dfe47fb8afd9afe3d4':

commit | commitdiff | tree

Andreas Gampe [Thu, 27 Aug 2015 10:21:09 +0000 (10:21 +0000)]

am 3255e2f9: (-s ours) Merge "Hwui: Remove unused variables" into mnc-dev-plus-aosp

* commit '3255e2f961a005033dd761982fcd06697441bc05':
Hwui: Remove unused variables

commit | commitdiff | tree

Elliott Hughes [Thu, 27 Aug 2015 10:21:01 +0000 (10:21 +0000)]

am 17b4be07: (-s ours) am 39669d7f: am 6fdc6333: Merge "Lose HAVE_ANDROID_OS from frameworks/base."

* commit '17b4be07fed91da2f770be87f66b1e8918dff52f':

commit | commitdiff | tree

Raph Levien [Thu, 27 Aug 2015 10:20:53 +0000 (10:20 +0000)]

am 9dc2d5cd: (-s ours) am beabcb92: Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev

* commit '9dc2d5cd5bcd7519537828794a77a45d0a14ea03':

commit | commitdiff | tree

Eino-Ville Talvala [Thu, 27 Aug 2015 10:20:45 +0000 (10:20 +0000)]

am 09c62671: (-s ours) am 242ff8a8: Merge "Camera: Fix framework bugs with DEPTH-only camera devices" into mnc-dev

* commit '09c62671e9d64ad7e3c36c3265c650b3b03b3822':

commit | commitdiff | tree

Mike Dodd [Thu, 27 Aug 2015 10:20:37 +0000 (10:20 +0000)]

am fdc169c1: (-s ours) am ad285c16: Merge "Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)."" into mnc-dev

* commit 'fdc169c1b065d3306347407657964aeb043c47d3':

commit | commitdiff | tree

Adrian Roos [Thu, 27 Aug 2015 10:20:29 +0000 (10:20 +0000)]

am 44a80e20: (-s ours) am c0a4883d: Merge "Prevent overlap of color views in landscape" into mnc-dev

* commit '44a80e2013022dea9d7e8bec21f095a19cb6131a':

commit | commitdiff | tree

Jason Monk [Thu, 27 Aug 2015 10:20:22 +0000 (10:20 +0000)]

am fab69aaa: (-s ours) am 0c762957: Merge "Fix tuner for secondary users" into mnc-dev

* commit 'fab69aaa943bd844f7393aeec4cd0481392835db':

commit | commitdiff | tree

Mike Dodd [Thu, 27 Aug 2015 10:20:14 +0000 (10:20 +0000)]

am c1372049: (-s ours) am 7f2f96cc: Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev

* commit 'c1372049d7a6f6ce51bc70a15eb459015e4b0bca':

commit | commitdiff | tree

Todd Kennedy [Thu, 27 Aug 2015 10:20:05 +0000 (10:20 +0000)]

am b56511a7: (-s ours) am 24e4d48f: Merge "Promote system app permissions" into mnc-dev

* commit 'b56511a7d9c3fbada9a9f522904fb75c958a6738':

commit | commitdiff | tree

Michael Wright [Thu, 27 Aug 2015 10:19:52 +0000 (10:19 +0000)]

am 782fd147: (-s ours) am e20493ea: Merge "Log last filtered sensor timestamp." into mnc-dev

* commit '782fd14764ff9e579d4473be204843c48895c07c':

commit | commitdiff | tree

Narayan Kamath [Thu, 27 Aug 2015 10:19:41 +0000 (10:19 +0000)]

am d29382aa: (-s ours) am bf88205b: Fall back to persist.sys.language/country if locale isn\'t set.

* commit 'd29382aaf0dc68eb5a41621fedabeca4406efe06':

commit | commitdiff | tree

Alex Klyubin [Thu, 27 Aug 2015 10:19:24 +0000 (10:19 +0000)]

am d03c38e7: (-s ours) am e19b76cb: Merge "Add more examples of generating/importing keys to Javadocs." into mnc-dev

* commit 'd03c38e7041759dda3c11fc26c691661cfbe8e8b':

commit | commitdiff | tree

Lorenzo Colitti [Thu, 27 Aug 2015 10:19:13 +0000 (10:19 +0000)]

am 6ceed53e: (-s ours) am e022cb08: Merge "Don\'t attempt to stop the receive thread if we never started it." into mnc-dev

* commit '6ceed53eeb6d14bb5dbf1f5ae719ad2722de9fb5':

commit | commitdiff | tree

Carlos Valdivia [Thu, 27 Aug 2015 10:18:56 +0000 (10:18 +0000)]

am 47c5338b: (-s ours) am 968fc3ab: Merge "Fix deadlock." into mnc-dev

* commit '47c5338bc33b69ecbe4cfd719735112ef30f0521':

commit | commitdiff | tree

Julia Reynolds [Thu, 27 Aug 2015 10:18:46 +0000 (10:18 +0000)]

am c787d8bc: (-s ours) am 77b0d6e9: Merge "New landscape Navigation bar icons." into mnc-dev

* commit 'c787d8bc1343aeee44b65ea632bb107bd20c2238':

commit | commitdiff | tree

Filip Gruszczynski [Thu, 27 Aug 2015 10:18:38 +0000 (10:18 +0000)]

am 6c55ec30: (-s ours) am 59123b9b: Merge "When closing task stack remove reference to display content." into mnc-dev

* commit '6c55ec301531844089ebcf696b1259ae7282e116':

commit | commitdiff | tree

Dianne Hackborn [Thu, 27 Aug 2015 10:18:29 +0000 (10:18 +0000)]

am 75a3f8f1: (-s ours) am 15f704e7: Merge "Fix issue #23122445: Add 420 density" into mnc-dev

* commit '75a3f8f1d27a9281b229193c9c267f03cbcc4c9d':

commit | commitdiff | tree

Wale Ogunwale [Thu, 27 Aug 2015 10:18:21 +0000 (10:18 +0000)]

am b2a979a3: (-s ours) am e43d43c3: Merge "Fixed issue with moveTaskToBack on single stack devices" into mnc-dev

* commit 'b2a979a3b7033dd3cfd868c80e409026baf52d7e':

commit | commitdiff | tree

Andres Morales [Thu, 27 Aug 2015 10:18:13 +0000 (10:18 +0000)]

am bb5b3ca2: (-s ours) am 494d6e9b: [fingerprint] use credential owner in FingerprintService

* commit 'bb5b3ca25080ba3c7fd4a3942646efb15265e441':

commit | commitdiff | tree

Winson Chung [Thu, 27 Aug 2015 10:18:05 +0000 (10:18 +0000)]

am a01479f5: (-s ours) am 8851608d: Merge "Always call onProvidersChanged() when packages containing widgets are updated." into mnc-dev

* commit 'a01479f51513f35a07c555f61970b1155eac0f7e':

commit | commitdiff | tree

Chris Manton [Thu, 27 Aug 2015 10:17:56 +0000 (10:17 +0000)]

am 3080ceb1: (-s ours) am 19aa341a: Merge "Save data registration roaming state" into mnc-dev

* commit '3080ceb18cd215eb731575136be6716607f2dc6d':

commit | commitdiff | tree

Diego Perez [Thu, 27 Aug 2015 10:17:44 +0000 (10:17 +0000)]

am 0dcad221: (-s ours) am 7d85b543: Merge "Make DelegateManager thread safe" into mnc-dev

* commit '0dcad221f1bd2852a18a672a7722bbfa50918aca':

commit | commitdiff | tree

Alan Viverette [Thu, 27 Aug 2015 10:17:32 +0000 (10:17 +0000)]

am d764de10: (-s ours) am 105febd2: Merge "Don\'t re-wrap alert dialog context" into mnc-dev

* commit 'd764de105d43dc0b6ce26dcc9208684b330b2fc1':

commit | commitdiff | tree

Alan Viverette [Thu, 27 Aug 2015 10:17:17 +0000 (10:17 +0000)]

am db0af526: (-s ours) am 11104791: Merge "Ensure ripple mask is drawn at correct position" into mnc-dev

* commit 'db0af5261f15eecff7ca3538591c96885aa494fc':