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

Jim Miller [Thu, 27 Aug 2015 10:42:19 +0000 (10:42 +0000)]

am d8f61f20: (-s ours) am 74d9c2aa: Merge "Fix type-o in FingerprintManager documentation" into mnc-dev

* commit 'd8f61f201dfc0fe669d45ee2f0d540de3771b984':

commit | commitdiff | tree

Tom Cherry [Thu, 27 Aug 2015 10:42:11 +0000 (10:42 +0000)]

am 9f5e9ec7: (-s ours) am b9ac485a: am 49948146: Merge "bundle init.rc contents with its service"

* commit '9f5e9ec76ab7c0698469ec75785294aa94480f57':

commit | commitdiff | tree

Svetoslav Ganov [Thu, 27 Aug 2015 10:42:03 +0000 (10:42 +0000)]

am 04a1cac9: (-s ours) am cb59747d: Merge "Add missing removed permissions to the platform manifest" into mnc-dev

* commit '04a1cac9374326b320e8cecaae3a1156662901b7':

commit | commitdiff | tree

Sebastien Hertz [Thu, 27 Aug 2015 10:41:55 +0000 (10:41 +0000)]

am fcb005d1: (-s ours) am 7cd2d343: am 852c6178: (-s ours) am b63e291d: am 88556ac2: am 599dc2bd: am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE

* commit 'fcb005d1c8b8aea6581eb40cb34b6016a4389968':

commit | commitdiff | tree

Sebastien Hertz [Thu, 27 Aug 2015 10:41:47 +0000 (10:41 +0000)]

am d5241d83: (-s ours) am c5151d2c: am b60bc0ec: resolved conflicts for merge of a2d19318 to lmp-mr1-ub-dev

* commit 'd5241d83fe357bb6bdeb61a507ef8e0af2949949':

commit | commitdiff | tree

Christopher Tate [Thu, 27 Aug 2015 10:41:38 +0000 (10:41 +0000)]

am 1ae064d6: (-s ours) am ddc2536d: Make sure to kill restore-at-install full-data targets after restore

* commit '1ae064d6c2c33ed50a70982952a2034999c018e3':

commit | commitdiff | tree

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

am 0f84781b: (-s ours) am 54c807e7: Merge "Translate ripple mask to account for drawable bounds" into mnc-dev

* commit '0f84781bbab1c2f2d982b962507898f8351ed6fd':

commit | commitdiff | tree

Chong Zhang [Thu, 27 Aug 2015 10:41:21 +0000 (10:41 +0000)]

am 9f38dd3d: (-s ours) am 7efe9f67: am 5923d161: Merge "wm: call displayReady for all built in displays when system is ready."

* commit '9f38dd3d394e447f7c5d78de714f3eab946dfb77':

commit | commitdiff | tree

Fyodor Kupolov [Thu, 27 Aug 2015 10:41:13 +0000 (10:41 +0000)]

am 8a363bb1: (-s ours) am 1773ded8: Merge "Fixed key comparison in equals method" into mnc-dev

* commit '8a363bb13de1fb0600a69352a0fb4a844fba21e2':

commit | commitdiff | tree

Elliott Hughes [Thu, 27 Aug 2015 10:41:05 +0000 (10:41 +0000)]

am 1262059c: (-s ours) am 260cb53f: am ce4fbb4d: Merge "zygote: fix memory leak when fork process"

* commit '1262059c072375cd5bd48e86b7ee69d66848494d':

commit | commitdiff | tree

David Friedman [Thu, 27 Aug 2015 10:40:55 +0000 (10:40 +0000)]

am 5bc17ad2: (-s ours) am 46eddef4: am 504623e1: am 5389f46c: Docs: Fixes to interactive-watch-face docs (CL 743190)

* commit '5bc17ad258d65c87826ed3c9503b627b03f372b4':

commit | commitdiff | tree

Dianne Hackborn [Thu, 27 Aug 2015 10:40:48 +0000 (10:40 +0000)]

am 0171f382: (-s ours) am c14cbac4: Merge "Fix issue #23361510: Increase assist timeout from 500ms to 1 second" into mnc-dev

* commit '0171f3829cf8b9257a77fca49b8326287c76b286':

commit | commitdiff | tree

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

am 746aee22: (-s ours) am f3ad1eab: Merge "Pass underlying volume UUID to StorageVolume." into mnc-dev

* commit '746aee22e872581607fc1bc9a6425ba924e73393':

commit | commitdiff | tree

David Friedman [Thu, 27 Aug 2015 10:40:31 +0000 (10:40 +0000)]

am 8e79119c: (-s ours) am 6a21a5a1: am 9f4ddca9: am 56c22d29: Merge "Docs: Creating interactive watch faces Bug: 21721463" into mnc-preview-docs

* commit '8e79119ca2703b6ffd780a5314a4b6baf19908d8':

commit | commitdiff | tree

David Friedman [Thu, 27 Aug 2015 10:40:22 +0000 (10:40 +0000)]

am afee154d: (-s ours) am 6540375a: am 311f8eee: am ed54f60a: Merge "Docs: Updating, clarifying Debug-over-WiFi instructions. Bug: 21371836" into mnc-preview-docs

* commit 'afee154dd7dd90088e89d444301108cca0854bc6':

commit | commitdiff | tree

Tyler Gunn [Thu, 27 Aug 2015 10:40:14 +0000 (10:40 +0000)]

am 4f03dfe7: (-s ours) am 1e9bfc64: Fix incorrect android.telecom.Call.Details equality check.

* commit '4f03dfe78e9d2f925fabc10c640944e0f2a9c7d4':

commit | commitdiff | tree

Lorenzo Colitti [Thu, 27 Aug 2015 10:40:05 +0000 (10:40 +0000)]

am c4b6cee6: (-s ours) am 11e84bde: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into mnc-dev

* commit 'c4b6cee6c81975ca31a45aaa35901d6ed8a2d9e1':

commit | commitdiff | tree

Amith Yamasani [Thu, 27 Aug 2015 10:39:57 +0000 (10:39 +0000)]

am 8f3ef070: (-s ours) am e3de6c5d: Merge "Fix crashes when removing work profile" into mnc-dev

* commit '8f3ef0700b1aa2acdf23fea024bf0aacf5953844':

commit | commitdiff | tree

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

am 4519b64f: (-s ours) am 29cd8808: Merge "Fix issue #23326715: Clarify --checkin/-c options in batterystats" into mnc-dev

* commit '4519b64fdad7bc6b09befbf3ff22245c6bdb8c5f':

commit | commitdiff | tree

Elliott Hughes [Thu, 27 Aug 2015 10:39:41 +0000 (10:39 +0000)]

am c301ab8d: (-s ours) Move aapt2 off HAVE_MS_C_RUNTIME.

* commit 'c301ab8d6ab553ee0e641558f9fbe2f974a70e52':
Move aapt2 off HAVE_MS_C_RUNTIME.

commit | commitdiff | tree

Jorim Jaggi [Thu, 27 Aug 2015 10:39:33 +0000 (10:39 +0000)]

am 127a0d16: (-s ours) am 8b8fa3e9: Fix SysUI crash when no metadata is provided

* commit '127a0d16f464ba3a1af12a72c72e875a605b763e':

commit | commitdiff | tree

Jorim Jaggi [Thu, 27 Aug 2015 10:39:26 +0000 (10:39 +0000)]

am 265b194f: (-s ours) am f610bd78: Fix race conditions for camera prewarm service

* commit '265b194fac5b300461a6c70ada18d5a3d898adec':

commit | commitdiff | tree

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

am fc7f6197: (-s ours) am 0b804542: Merge "Constrain drawBitmap matrix-to-rect optimization" into mnc-dev

* commit 'fc7f6197cb7df0d293ba18e7eca3849c5f4d3376':

commit | commitdiff | tree

Tenghui Zhu [Thu, 27 Aug 2015 10:39:09 +0000 (10:39 +0000)]

am 605f4b88: (-s ours) am c9ecc985: Merge "Add some bookmarks to plugin-for-gradle page" into mnc-dev

* commit '605f4b8881a905aeca04d90e8b8d3c1f40430e2f':

commit | commitdiff | tree

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

am 35796dc7: (-s ours) am 54bdb2e7: Merge "docs: Updated hardware system images for M." into mnc-dev

* commit '35796dc7a8bca07b2dc8c61b9e07f1c5cb8ad855':

commit | commitdiff | tree

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

am 750598f8: (-s ours) am 886e7a63: Merge "Change default cellular activity timeout to 10" into mnc-dev

* commit '750598f89e1a313c2bbea6ee4c87780891e0108a':

commit | commitdiff | tree

Jim Miller [Thu, 27 Aug 2015 10:38:47 +0000 (10:38 +0000)]

am af22fa7b: (-s ours) am 448216e7: Merge "Revert "Disable fingerprint when remotely reset by DPM"" into mnc-dev

* commit 'af22fa7be8883f9780a2d18283ab9f859b4a2c55':

commit | commitdiff | tree

Roozbeh Pournader [Thu, 27 Aug 2015 10:38:38 +0000 (10:38 +0000)]

am a0a6d2c5: (-s ours) am 53c38c88: Merge "Revert "Create a special CONSTRAINED font bucket in frameworks."" into mnc-dev

* commit 'a0a6d2c5d6e4214f407911667ad2b6004fcfe2c7':

commit | commitdiff | tree

Dianne Hackborn [Thu, 27 Aug 2015 10:38:30 +0000 (10:38 +0000)]

am c8869f93: (-s ours) am af75c17b: Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest

* commit 'c8869f93928277e4a5e8867c955b733f9c241723':

commit | commitdiff | tree

Tao Bao [Thu, 27 Aug 2015 10:38:18 +0000 (10:38 +0000)]

am 9d995335: (-s ours) am 2e3746ab: am 9bcb0fcc: Merge "Recursively delete directories in handleAftermath()."

* commit '9d995335f0c8d5090ba6c774853fe261037177eb':

commit | commitdiff | tree

Sebastien Hertz [Thu, 27 Aug 2015 10:38:08 +0000 (10:38 +0000)]

am e9538685: (-s ours) am 9a010d0a: Merge "Allow debugging only for apps forked from zygote" into mnc-dev

* commit 'e95386852e70995e3356177c7e0d507fd1d01b65':

commit | commitdiff | tree

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

am cfdc3640: (-s ours) am 96695d2f: Merge "docs: App link doc update for M Preview 3" into mnc-dev

* commit 'cfdc3640c214450007772262142bef35654b0a44':

commit | commitdiff | tree

David Friedman [Thu, 27 Aug 2015 10:37:49 +0000 (10:37 +0000)]

am 82a1f1bc: (-s ours) am 3e40a27e: Merge "Docs: Fixing files that didn\'t merge properly from mnc-preview-docs" into mnc-dev

* commit '82a1f1bc9464b985a9cf89338ebfef882602b7b3':

commit | commitdiff | tree

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

am e6c34f89: (-s ours) am 610008c0: Merge "Clear old clip rect when creating new surface." into mnc-dev

* commit 'e6c34f8990e3560c3d65ec9c15cf6cd39fbc8f2a':

commit | commitdiff | tree

Dianne Hackborn [Thu, 27 Aug 2015 10:37:28 +0000 (10:37 +0000)]

am 59fa0448: (-s ours) am 12b9c2d6: Merge "Fix issue #23214751: Get a GPS fix before going in to doze" into mnc-dev

* commit '59fa0448fcf0223e41619d4f7d4b51626e46994c':

commit | commitdiff | tree

Chris Tate [Thu, 27 Aug 2015 10:37:18 +0000 (10:37 +0000)]

am 8b52be33: (-s ours) am c0a2254e: Merge "Clean up properly if outcall for doRestoreFinished() fails" into mnc-dev

* commit '8b52be334e5c20f3f286b9962e711b12f860ef7f':

commit | commitdiff | tree

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

am f6e67197: (-s ours) am 7aa6fc67: Merge "docs: Re-added gms_lists.js and gcm_lists.js for GMS v7.8 (Reblochon) Javadoc discovery." into mnc-dev

* commit 'f6e67197ddd0f535086ffe940081b128b54593d0':

commit | commitdiff | tree

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

am 910ee26e: (-s ours) am 036895e1: Merge "docs: M Preview 3 post-release cleanup" into mnc-dev

* commit '910ee26e66ce0b6897771bbe96ea60704962ec3b':

commit | commitdiff | tree

Amit Mahajan [Thu, 27 Aug 2015 10:36:54 +0000 (10:36 +0000)]

am 1091665c: (-s ours) am dd8df041: Merge "Setting config_use_sim_language_file to false for 334-020." into mnc-dev

* commit '1091665c4df08042157a76f3843353ea136959d6':

commit | commitdiff | tree

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