OSDN Git Service

android-x86/frameworks-base.git
8 years agoam 43c8a1c8: am 3ee95327: am 6c00399c: docs: studio 1.3 private resources
Rich Slogar [Mon, 17 Aug 2015 15:48:07 +0000 (15:48 +0000)]
am 43c8a1c8: am 3ee95327: am 6c00399c: docs: studio 1.3 private resources

* commit '43c8a1c8a66302f17d83c7d38d19d41e2e26b32f':
  docs: studio 1.3 private resources

8 years agoam 1614f115: am 8f0d5451: am e5fe2468: docs: studio 1.3 allocation tracker
Rich Slogar [Mon, 17 Aug 2015 15:48:00 +0000 (15:48 +0000)]
am 1614f115: am 8f0d5451: am e5fe2468: docs: studio 1.3 allocation tracker

* commit '1614f115c38c68d49a74c2553a68a46bd2f4c913':
  docs: studio 1.3 allocation tracker

8 years agoam 605c890b: am 860e65be: am 16c5726e: docs: studio 1.3 developer services
Rich Slogar [Mon, 17 Aug 2015 15:47:56 +0000 (15:47 +0000)]
am 605c890b: am 860e65be: am 16c5726e: docs: studio 1.3 developer services

* commit '605c890bf0e01235bb538c9175495830e77f0783':
  docs: studio 1.3 developer services

8 years agoam 30996739: am e62df60a: am b90583ac: Merge "docs: create-project-link in studio...
Rich Sloager [Mon, 17 Aug 2015 15:47:52 +0000 (15:47 +0000)]
am 30996739: am e62df60a: am b90583ac: Merge "docs: create-project-link in studio overview" into mnc-preview-docs

* commit '309967393a436e28e695b7f44a1cb9d051013255':
  docs: create-project-link in studio overview

8 years agoam c6bfe586: am ccd0fe27: am c87ca50a: Merge "docs: studio 1.3 downloads" into mnc...
Rich Sloager [Mon, 17 Aug 2015 15:47:46 +0000 (15:47 +0000)]
am c6bfe586: am ccd0fe27: am c87ca50a: Merge "docs: studio 1.3 downloads" into mnc-preview-docs

* commit 'c6bfe58697bc0055d493917240f0e74aa73eae08':
  docs: studio 1.3 downloads

8 years agoam 0ac81a6e: am fd8da61a: am f0cd0441: Merge "docs: studio 1.3 manifest merger update...
Rich Sloager [Mon, 17 Aug 2015 15:47:38 +0000 (15:47 +0000)]
am 0ac81a6e: am fd8da61a: am f0cd0441: Merge "docs: studio 1.3 manifest merger update" into mnc-preview-docs

* commit '0ac81a6e14ce25f93520039bb10033469791e6d9':
  docs: studio 1.3 manifest merger update

8 years agoam 3cff3688: am 371ccd13: am 51c02f6a: Merge "docs: studio 1.3 revisions - android...
Rich Sloager [Mon, 17 Aug 2015 15:47:33 +0000 (15:47 +0000)]
am 3cff3688: am 371ccd13: am 51c02f6a: Merge "docs: studio 1.3 revisions - android plugin for gradle" into mnc-preview-docs

* commit '3cff3688d93d26b0f73755dc61d1cda1ffbb3306':
  docs: studio 1.3 revisions - android plugin for gradle

8 years agoam 110a5574: am f82f33d3: am 4c5b6cc4: Merge "docs: studio 1.3 live templates" into...
Rich Sloager [Mon, 17 Aug 2015 15:47:28 +0000 (15:47 +0000)]
am 110a5574: am f82f33d3: am 4c5b6cc4: Merge "docs: studio 1.3 live templates" into mnc-preview-docs

* commit '110a55749af8c4190e39358e6d6be43cfad81ed3':
  docs: studio 1.3 live templates

8 years agoam 7026df3b: am 5f8d3728: am b8987585: Merge "docs: studio 1.3 revisions - studio...
Rich Sloager [Mon, 17 Aug 2015 15:47:23 +0000 (15:47 +0000)]
am 7026df3b: am 5f8d3728: am b8987585: Merge "docs: studio 1.3 revisions - studio" into mnc-preview-docs

* commit '7026df3b94143bf486c7477f1e3884ce255bb879':
  docs: studio 1.3 revisions - studio

8 years agoam 7cbc35be: am c4fe8db7: am 322de02a: Merge "docs: studio 1.3 hprof viewer" into...
Rich Sloager [Mon, 17 Aug 2015 15:47:18 +0000 (15:47 +0000)]
am 7cbc35be: am c4fe8db7: am 322de02a: Merge "docs: studio 1.3 hprof viewer" into mnc-preview-docs

* commit '7cbc35bea98b7df728223870be3370f3a97d94ff':
  docs: studio 1.3 hprof viewer

8 years agoam 1c6997b3: am 27b24602: am 47c88fca: Merge "docs: studio 1.3 separate test folder...
Rich Sloager [Mon, 17 Aug 2015 15:47:13 +0000 (15:47 +0000)]
am 1c6997b3: am 27b24602: am 47c88fca: Merge "docs: studio 1.3 separate test folder" into mnc-preview-docs

* commit '1c6997b3ecf8036257c17b072a165ab6a3904a08':
  docs: studio 1.3 separate test folder

8 years agoam ff7526c1: am 71178f02: am 29dfe902: Merge "docs: studio 1.3 fingerprint support...
Rich Sloager [Mon, 17 Aug 2015 15:47:09 +0000 (15:47 +0000)]
am ff7526c1: am 71178f02: am 29dfe902: Merge "docs: studio 1.3 fingerprint support" into mnc-preview-docs

* commit 'ff7526c1da5cb650bcfa56768b4c43a1a90f5256':
  docs: studio 1.3 fingerprint support

8 years agoam b4e5608d: am 57cdc011: am 054711b6: Merge "docs: studio 1.3 sdk manager updates...
Rich Sloager [Mon, 17 Aug 2015 15:47:04 +0000 (15:47 +0000)]
am b4e5608d: am 57cdc011: am 054711b6: Merge "docs: studio 1.3 sdk manager updates" into mnc-preview-docs

* commit 'b4e5608d928ff4221ea1923edc143207a7157908':
  docs: studio 1.3 sdk manager updates

8 years agoam 1beefcad: am 7a76e44d: am 1f6a5f89: docs: design support library 22.2.1 revisions
Rich Slogar [Mon, 17 Aug 2015 15:46:59 +0000 (15:46 +0000)]
am 1beefcad: am 7a76e44d: am 1f6a5f89: docs: design support library 22.2.1 revisions

* commit '1beefcad4240d5ceb8004c1fc9900de536203cb1':
  docs: design support library 22.2.1 revisions

8 years agoam 8c6a2208: am 8a9972cc: am 803c5738: Merge "docs: Updated the list of auto partners...
Andrew Solovay [Mon, 17 Aug 2015 15:46:55 +0000 (15:46 +0000)]
am 8c6a2208: am 8a9972cc: am 803c5738: Merge "docs: Updated the list of auto partners, added links" into mnc-preview-docs

* commit '8c6a2208d381dc6e06039f5885518e04b249db17':
  docs: Updated the list of auto partners, added links

8 years agoam 3ee95327: am 6c00399c: docs: studio 1.3 private resources
Rich Slogar [Mon, 17 Aug 2015 15:38:38 +0000 (15:38 +0000)]
am 3ee95327: am 6c00399c: docs: studio 1.3 private resources

* commit '3ee953275435eb2a3e0c339695ec976806ef9276':
  docs: studio 1.3 private resources

8 years agoam 8f0d5451: am e5fe2468: docs: studio 1.3 allocation tracker
Rich Slogar [Mon, 17 Aug 2015 15:38:33 +0000 (15:38 +0000)]
am 8f0d5451: am e5fe2468: docs: studio 1.3 allocation tracker

* commit '8f0d5451302c48dcaed262e9f3212c92ff53ffda':
  docs: studio 1.3 allocation tracker

8 years agoam 860e65be: am 16c5726e: docs: studio 1.3 developer services
Rich Slogar [Mon, 17 Aug 2015 15:38:28 +0000 (15:38 +0000)]
am 860e65be: am 16c5726e: docs: studio 1.3 developer services

* commit '860e65be5cecd4bedaee35d25d9ed37b507e546c':
  docs: studio 1.3 developer services

8 years agoam e62df60a: am b90583ac: Merge "docs: create-project-link in studio overview" into...
Rich Sloager [Mon, 17 Aug 2015 15:38:21 +0000 (15:38 +0000)]
am e62df60a: am b90583ac: Merge "docs: create-project-link in studio overview" into mnc-preview-docs

* commit 'e62df60aea428c78ffaa33b74cc2faba60e05482':
  docs: create-project-link in studio overview

8 years agoam ccd0fe27: am c87ca50a: Merge "docs: studio 1.3 downloads" into mnc-preview-docs
Rich Sloager [Mon, 17 Aug 2015 15:38:14 +0000 (15:38 +0000)]
am ccd0fe27: am c87ca50a: Merge "docs: studio 1.3 downloads" into mnc-preview-docs

* commit 'ccd0fe27ef2fd03c3c8238003a936f01c3689ebd':
  docs: studio 1.3 downloads

8 years agoam fd8da61a: am f0cd0441: Merge "docs: studio 1.3 manifest merger update" into mnc...
Rich Sloager [Mon, 17 Aug 2015 15:38:09 +0000 (15:38 +0000)]
am fd8da61a: am f0cd0441: Merge "docs: studio 1.3 manifest merger update" into mnc-preview-docs

* commit 'fd8da61afdc883550a25f62003c8beff3c91b9e3':
  docs: studio 1.3 manifest merger update

8 years agoam 371ccd13: am 51c02f6a: Merge "docs: studio 1.3 revisions - android plugin for...
Rich Sloager [Mon, 17 Aug 2015 15:38:03 +0000 (15:38 +0000)]
am 371ccd13: am 51c02f6a: Merge "docs: studio 1.3 revisions - android plugin for gradle" into mnc-preview-docs

* commit '371ccd1343c6710f1492e9e5a01f287d7ac29369':
  docs: studio 1.3 revisions - android plugin for gradle

8 years agoam f82f33d3: am 4c5b6cc4: Merge "docs: studio 1.3 live templates" into mnc-preview...
Rich Sloager [Mon, 17 Aug 2015 15:37:57 +0000 (15:37 +0000)]
am f82f33d3: am 4c5b6cc4: Merge "docs: studio 1.3 live templates" into mnc-preview-docs

* commit 'f82f33d3aef0c9211c5ed66d583ce6d5f5cf92eb':
  docs: studio 1.3 live templates

8 years agoam 5f8d3728: am b8987585: Merge "docs: studio 1.3 revisions - studio" into mnc-previe...
Rich Sloager [Mon, 17 Aug 2015 15:37:50 +0000 (15:37 +0000)]
am 5f8d3728: am b8987585: Merge "docs: studio 1.3 revisions - studio" into mnc-preview-docs

* commit '5f8d3728480d74f997f513049a9d8e58557e81f3':
  docs: studio 1.3 revisions - studio

8 years agoam c4fe8db7: am 322de02a: Merge "docs: studio 1.3 hprof viewer" into mnc-preview...
Rich Sloager [Mon, 17 Aug 2015 15:37:44 +0000 (15:37 +0000)]
am c4fe8db7: am 322de02a: Merge "docs: studio 1.3 hprof viewer" into mnc-preview-docs

* commit 'c4fe8db79b3366190cbdb282915343c7a4f1366b':
  docs: studio 1.3 hprof viewer

8 years agoam 27b24602: am 47c88fca: Merge "docs: studio 1.3 separate test folder" into mnc...
Rich Sloager [Mon, 17 Aug 2015 15:37:38 +0000 (15:37 +0000)]
am 27b24602: am 47c88fca: Merge "docs: studio 1.3 separate test folder" into mnc-preview-docs

* commit '27b246028af449000d63e4349c66d4b555749de4':
  docs: studio 1.3 separate test folder

8 years agoam 71178f02: am 29dfe902: Merge "docs: studio 1.3 fingerprint support" into mnc-previ...
Rich Sloager [Mon, 17 Aug 2015 15:37:32 +0000 (15:37 +0000)]
am 71178f02: am 29dfe902: Merge "docs: studio 1.3 fingerprint support" into mnc-preview-docs

* commit '71178f024038591e04b1e32ace4180265eae14ce':
  docs: studio 1.3 fingerprint support

8 years agoam 57cdc011: am 054711b6: Merge "docs: studio 1.3 sdk manager updates" into mnc-previ...
Rich Sloager [Mon, 17 Aug 2015 15:37:25 +0000 (15:37 +0000)]
am 57cdc011: am 054711b6: Merge "docs: studio 1.3 sdk manager updates" into mnc-preview-docs

* commit '57cdc0116fb7f9f2edc30337a8b787a341f37875':
  docs: studio 1.3 sdk manager updates

8 years agoam 7a76e44d: am 1f6a5f89: docs: design support library 22.2.1 revisions
Rich Slogar [Mon, 17 Aug 2015 15:37:19 +0000 (15:37 +0000)]
am 7a76e44d: am 1f6a5f89: docs: design support library 22.2.1 revisions

* commit '7a76e44db90ae0f9a3b570c81b394e1630c814b9':
  docs: design support library 22.2.1 revisions

8 years agoam 8a9972cc: am 803c5738: Merge "docs: Updated the list of auto partners, added links...
Andrew Solovay [Mon, 17 Aug 2015 15:37:13 +0000 (15:37 +0000)]
am 8a9972cc: am 803c5738: Merge "docs: Updated the list of auto partners, added links" into mnc-preview-docs

* commit '8a9972ccac4f65159c8c6511916647184ac54b97':
  docs: Updated the list of auto partners, added links

8 years agoMerge "Show usb charging notification when in host mode" into mnc-dr-dev
Jason Monk [Mon, 17 Aug 2015 15:29:11 +0000 (15:29 +0000)]
Merge "Show usb charging notification when in host mode" into mnc-dr-dev

8 years agoam 5d467ac5: Merge "Remove uids with empty history from NetworkStats uid enumeration...
Esteban Talavera [Mon, 17 Aug 2015 14:53:53 +0000 (14:53 +0000)]
am 5d467ac5: Merge "Remove uids with empty history from NetworkStats uid enumeration" into mnc-dev

* commit '5d467ac54ab0390d6b911628d56294bb4277d2f1':
  Remove uids with empty history from NetworkStats uid enumeration

8 years agoMerge "Remove uids with empty history from NetworkStats uid enumeration" into mnc-dev
Esteban Talavera [Mon, 17 Aug 2015 14:47:49 +0000 (14:47 +0000)]
Merge "Remove uids with empty history from NetworkStats uid enumeration" into mnc-dev

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 17 Aug 2015 13:52:31 +0000 (06:52 -0700)]
Import translations. DO NOT MERGE

Change-Id: Iaffcfead62c6ca52dafd9e5776c65272851076cf
Auto-generated-cl: translation import

8 years agoam 4fd784e1: Merge "Add Support Lib v23 API Diff" into mnc-dev
Chris Banes [Mon, 17 Aug 2015 09:43:44 +0000 (09:43 +0000)]
am 4fd784e1: Merge "Add Support Lib v23 API Diff" into mnc-dev

* commit '4fd784e15228fb208368869b7190d5dfb9b6f95b':
  Add Support Lib v23 API Diff

8 years agoMerge "Add Support Lib v23 API Diff" into mnc-dev
Chris Banes [Mon, 17 Aug 2015 08:27:07 +0000 (08:27 +0000)]
Merge "Add Support Lib v23 API Diff" into mnc-dev

8 years agoam 70004d9f: docs: fix build errors due to linked apache http classes
Joe Fernandez [Mon, 17 Aug 2015 05:14:03 +0000 (05:14 +0000)]
am 70004d9f: docs: fix build errors due to linked apache http classes

* commit '70004d9f4c80d3dfc9d37ff1fe4c2f859e0849a7':
  docs: fix build errors due to linked apache http classes

8 years agodocs: fix build errors due to linked apache http classes
Joe Fernandez [Mon, 17 Aug 2015 05:01:31 +0000 (22:01 -0700)]
docs: fix build errors due to linked apache http classes

- apache.http packages have been dropped in mnc-dev, causing build errors

Change-Id: I3bcfe0e9a6ecfb20b27df1712e2e527f6af85982

8 years agoam 28f2ba8e: docs: Remove Google Play Services pages under Develop > Google Services.
Quddus Chong [Mon, 17 Aug 2015 04:37:32 +0000 (04:37 +0000)]
am 28f2ba8e: docs: Remove Google Play Services pages under Develop > Google Services.

* commit '28f2ba8e30d774859b38e91a3f1ab91e31a69caf':
  docs: Remove Google Play Services pages under Develop > Google Services.

8 years agodocs: Remove Google Play Services pages under Develop > Google Services.
Quddus Chong [Tue, 26 May 2015 21:21:05 +0000 (14:21 -0700)]
docs: Remove Google Play Services pages under Develop > Google Services.

Cherry-pick from Change-Id: I392075b58bebc5556f306c2d20987811efe90b13

Change-Id: I17ad018a0875b653c0706fd9bbe5f637760cdfbc

8 years agoam 85429c0d: docs: Android 5.1 API Release notes (Lollipop MR1)
Joe Fernandez [Mon, 17 Aug 2015 04:11:51 +0000 (04:11 +0000)]
am 85429c0d: docs: Android 5.1 API Release notes (Lollipop MR1)

* commit '85429c0d9476502afdcc66c0379fde632d8e5863':
  docs: Android 5.1 API Release notes (Lollipop MR1)

8 years agodocs: Android 5.1 API Release notes (Lollipop MR1)
Joe Fernandez [Fri, 27 Feb 2015 05:55:07 +0000 (21:55 -0800)]
docs: Android 5.1 API Release notes (Lollipop MR1)

Cherry pick from Change-Id: I47f59ade26086b8368d8b395f92992edc27510d0

Change-Id: I47f59ade26086b8368d8b395f92992edc27510d0

8 years agoam 637db47e: docs: SDK Tools v23.3.4 release download links
Joe Fernandez [Mon, 17 Aug 2015 03:59:52 +0000 (03:59 +0000)]
am 637db47e: docs: SDK Tools v23.3.4 release download links

* commit '637db47e520f87565227b00eff67435425b5eabc':
  docs: SDK Tools v23.3.4 release download links

8 years agodocs: SDK Tools v23.3.4 release download links
Joe Fernandez [Mon, 17 Aug 2015 03:51:29 +0000 (20:51 -0700)]
docs: SDK Tools v23.3.4 release download links

- SDK tools update for Android 6.0 (API level 23) and M Preview 3

Change-Id: I32134f632d4a53162cab61237f1c50cba7d6bd71

8 years agoam 0baf95bf: docs: SDK Tools Release notes for v24.3.4
Joe Fernandez [Mon, 17 Aug 2015 03:31:35 +0000 (03:31 +0000)]
am 0baf95bf: docs: SDK Tools Release notes for v24.3.4

* commit '0baf95bfdb60de76037fa527964313645cd85f15':
  docs: SDK Tools Release notes for v24.3.4

8 years agodocs: SDK Tools Release notes for v24.3.4
Joe Fernandez [Fri, 14 Aug 2015 19:22:43 +0000 (12:22 -0700)]
docs: SDK Tools Release notes for v24.3.4

- Support for API 23
- Emulator fixes (multi-core, GPU emulation support and fixes)

Change-Id: Id5a89906e14a4393ddd8d201a8b1e45d1ec60cc3

8 years agoam 472b6b44: docs: Platform release notes for Android 6.0 (API 23) revision 1
Joe Fernandez [Mon, 17 Aug 2015 03:08:00 +0000 (03:08 +0000)]
am 472b6b44: docs: Platform release notes for Android 6.0 (API 23) revision 1

* commit '472b6b4480c39e9f76449c7ef566e0d76fdf118d':
  docs: Platform release notes for Android 6.0 (API 23) revision 1

8 years agodocs: Platform release notes for Android 6.0 (API 23) revision 1
Joe Fernandez [Fri, 14 Aug 2015 18:13:54 +0000 (11:13 -0700)]
docs: Platform release notes for Android 6.0 (API 23) revision 1

doc update to coincide with the release of M Preview 3

Change-Id: Ib33939f24d4499b3d1e4deb37807fa9e9a1f8d0c

8 years agoam 6a3016d2: Merge "docs: Build Tools 23.0.0 release notes" into mnc-dev
Joe Fernandez [Mon, 17 Aug 2015 01:56:42 +0000 (01:56 +0000)]
am 6a3016d2: Merge "docs: Build Tools 23.0.0 release notes" into mnc-dev

* commit '6a3016d2a77da45ff903f2883f42e52b4dcecdfb':
  docs: Build Tools 23.0.0 release notes

8 years agoMerge "docs: Build Tools 23.0.0 release notes" into mnc-dev
Joe Fernandez [Mon, 17 Aug 2015 01:52:05 +0000 (01:52 +0000)]
Merge "docs: Build Tools 23.0.0 release notes" into mnc-dev

8 years agoam bd4ed32f: docs: Preview 3 - Support page updates
Joe Fernandez [Mon, 17 Aug 2015 01:06:57 +0000 (01:06 +0000)]
am bd4ed32f: docs: Preview 3 - Support page updates

* commit 'bd4ed32ffa25e860b6212cff31510c801fffc39f':
  docs: Preview 3 - Support page updates

8 years agodocs: Preview 3 - Support page updates
Joe Fernandez [Sun, 16 Aug 2015 23:56:02 +0000 (16:56 -0700)]
docs: Preview 3 - Support page updates

- Add Key changes
- Add Known issues

Change-Id: I080b191a6609a4216e7521afa951b53f33609b90

8 years agoam 42c22d04: Merge "Doc change: Edits for final SDK and dev preview 3. Add selector...
Dirk Dougherty [Sun, 16 Aug 2015 23:57:51 +0000 (23:57 +0000)]
am 42c22d04: Merge "Doc change: Edits for final SDK and dev preview 3. Add selector to manage landing page image." into mnc-dev

* commit '42c22d04d9be578c4f32adfd43c1b37816a5c150':
  Doc change: Edits for final SDK and dev preview 3. Add selector to manage landing page image.

8 years agoam bf8f17f8: docs: Update Preview downloads page for Developer Preview 3
Joe Fernandez [Sun, 16 Aug 2015 23:57:47 +0000 (23:57 +0000)]
am bf8f17f8: docs: Update Preview downloads page for Developer Preview 3

* commit 'bf8f17f8dcfa0b923d7a8e16d85b09d61fdc39b9':
  docs: Update Preview downloads page for Developer Preview 3

8 years agoam 5c7817bc: Merge "Update the RenderScript runtime documentation for MNC." into...
Joe Fernandez [Sun, 16 Aug 2015 23:57:39 +0000 (23:57 +0000)]
am 5c7817bc: Merge "Update the RenderScript runtime documentation for MNC." into mnc-dev

* commit '5c7817bc2f784e6f48a7d26aadf901ac3eb7aca2':
  Update the RenderScript runtime documentation for MNC.

8 years agoMerge "Doc change: Edits for final SDK and dev preview 3. Add selector to manage...
Dirk Dougherty [Sun, 16 Aug 2015 22:26:03 +0000 (22:26 +0000)]
Merge "Doc change: Edits for final SDK and dev preview 3. Add selector to manage landing page image." into mnc-dev

8 years agoDoc change: Edits for final SDK and dev preview 3. Add selector to manage landing...
Dirk Dougherty [Sun, 16 Aug 2015 19:55:29 +0000 (12:55 -0700)]
Doc change: Edits for final SDK and dev preview 3. Add selector to manage landing page image.

Change-Id: I9afddbea9ae27bad236a0aff8cc373cb1baea5a4

8 years agodocs: Update Preview downloads page for Developer Preview 3
Joe Fernandez [Sun, 16 Aug 2015 21:54:03 +0000 (14:54 -0700)]
docs: Update Preview downloads page for Developer Preview 3

- System image downloads for Preview 3
- Preview 3 documentation download

Change-Id: I6a0daee44a1e8bd3421b0918daf72aff97b86e4c

8 years agoMerge "Update the RenderScript runtime documentation for MNC." into mnc-dev
Joe Fernandez [Sun, 16 Aug 2015 20:25:45 +0000 (20:25 +0000)]
Merge "Update the RenderScript runtime documentation for MNC." into mnc-dev

8 years agoam 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev
Eino-Ville Talvala [Sun, 16 Aug 2015 01:34:42 +0000 (01:34 +0000)]
am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev

* commit '1017f9862fb2cdfbff0abe12ef7d20b657a38e36':
  Camera2: Add camera type to getNumberOfCameras.

8 years agoam 6fa531e0: Merge "docs: Updated gms_lists.js for GMS v7.8 (Reblochon) Javadoc disco...
Quddus Chong [Sun, 16 Aug 2015 01:34:22 +0000 (01:34 +0000)]
am 6fa531e0: Merge "docs: Updated gms_lists.js for GMS v7.8 (Reblochon) Javadoc discovery." into mnc-dev

* commit '6fa531e0153d9b76994adbc631fed0a591e7ef93':
  docs: Updated gms_lists.js for GMS v7.8 (Reblochon) Javadoc discovery.

8 years agoam fbf170cb: Merge "docs: API diff report 22 to 23" into mnc-dev
Joe Fernandez [Sun, 16 Aug 2015 01:34:18 +0000 (01:34 +0000)]
am fbf170cb: Merge "docs: API diff report 22 to 23" into mnc-dev

* commit 'fbf170cb1038d73138e4b73cee26cdd18a150ee3':
  docs: API diff report 22 to 23

8 years agoam 886e382d: Merge "docs: Added Javadoc links for new M Preview permissions methods...
Andrew Solovay [Sun, 16 Aug 2015 01:34:13 +0000 (01:34 +0000)]
am 886e382d: Merge "docs: Added Javadoc links for new M Preview permissions methods" into mnc-dev

* commit '886e382dd8fd08ba1dcdc7dee2f462026b872b41':
  docs: Added Javadoc links for new M Preview permissions methods

8 years agoam 5bd5c25e: Merge "Docs: Migration, rewrite of Doze/App Standby doc from M Preview...
David Friedman [Sun, 16 Aug 2015 01:34:08 +0000 (01:34 +0000)]
am 5bd5c25e: Merge "Docs: Migration, rewrite of Doze/App Standby doc from M Preview behavior page Bug: 22947123" into mnc-dev

* commit '5bd5c25ee509a095a823896b51fd897bbe0871c9':
  Docs: Migration, rewrite of Doze/App Standby doc from M Preview behavior page Bug: 22947123

8 years agoam 06f552cf: Merge "Add debugging for issue #23190084: [APPComm][Dev Test] {Unable...
Dianne Hackborn [Sun, 16 Aug 2015 01:34:04 +0000 (01:34 +0000)]
am 06f552cf: Merge "Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo..." into mnc-dev

* commit '06f552cf9a89cd129beda8318a4832bd56d00796':
  Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo...

8 years agoam eee09f49: Merge "cherrypick from mnc-preview-docs docs: Preview 3 permissions...
Andrew Solovay [Sun, 16 Aug 2015 01:33:55 +0000 (01:33 +0000)]
am eee09f49: Merge "cherrypick from mnc-preview-docs docs: Preview 3 permissions docs. Original Change-Id: I4eaf45d98846e2bf9456f5896da4ec3079f4ba18" into mnc-dev

* commit 'eee09f495fa135c327429a9649908b0b40ac8754':
  cherrypick from mnc-preview-docs docs: Preview 3 permissions docs. Original Change-Id: I4eaf45d98846e2bf9456f5896da4ec3079f4ba18

8 years agoam 0cd143ad: Merge "AAPT: Fix regression in resource versioning" into mnc-dev
Adam Lesinski [Sun, 16 Aug 2015 01:33:48 +0000 (01:33 +0000)]
am 0cd143ad: Merge "AAPT: Fix regression in resource versioning" into mnc-dev

* commit '0cd143adae642465a26a7eaac96030bb18826e94':
  AAPT: Fix regression in resource versioning

8 years agoam b8fb239a: Merge "docs: Updated API Overview and Behavior Changes docs for M Previe...
Quddus Chong [Sun, 16 Aug 2015 01:33:44 +0000 (01:33 +0000)]
am b8fb239a: Merge "docs: Updated API Overview and Behavior Changes docs for M Preview 3." into mnc-dev

* commit 'b8fb239ac53ab462c8de12635c84c2216cf57f3b':
  docs: Updated API Overview and Behavior Changes docs for M Preview 3.

8 years agoam 9f238a94: Merge "Introducing M Land." into mnc-dev
Daniel Sandler [Sun, 16 Aug 2015 01:33:37 +0000 (01:33 +0000)]
am 9f238a94: Merge "Introducing M Land." into mnc-dev

* commit '9f238a9455639fccb6f44abd03752e3bb3bbc91e':
  Introducing M Land.

8 years agoresolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev
Dan Sandler [Sat, 15 Aug 2015 22:33:29 +0000 (18:33 -0400)]
resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev

Change-Id: I5b47fdbb8a9712c104f12c25b80063048849cebd

8 years agoresolved conflicts for merge of 8ad3e817 to mnc-dr-dev
Daniel Sandler [Sat, 15 Aug 2015 04:16:41 +0000 (00:16 -0400)]
resolved conflicts for merge of 8ad3e817 to mnc-dr-dev

Change-Id: Ic4ea07a337b8d831f281b0a4048d0b4132597aa7

8 years agoUpdate the RenderScript runtime documentation for MNC.
Jean-Luc Brouillet [Thu, 13 Aug 2015 21:26:10 +0000 (14:26 -0700)]
Update the RenderScript runtime documentation for MNC.

Update the documentation to include the features introduced in MNC.

b/23190418

Change-Id: I2c6dc11029a9bc0c2ca9bb8b712d4fd4660c3b29

8 years agoMerge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev
Eino-Ville Talvala [Sat, 15 Aug 2015 00:46:15 +0000 (00:46 +0000)]
Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev

8 years agoMerge "docs: Updated gms_lists.js for GMS v7.8 (Reblochon) Javadoc discovery." into...
Quddus Chong [Fri, 14 Aug 2015 23:06:22 +0000 (23:06 +0000)]
Merge "docs: Updated gms_lists.js for GMS v7.8 (Reblochon) Javadoc discovery." into mnc-dev

8 years agodocs: Updated gms_lists.js for GMS v7.8 (Reblochon) Javadoc discovery.
Quddus Chong [Fri, 14 Aug 2015 22:57:53 +0000 (15:57 -0700)]
docs: Updated gms_lists.js for GMS v7.8 (Reblochon) Javadoc discovery.

Change-Id: Ib9a36ce62b137316ae2b8bc626a0b0377f593a21

8 years agoMerge "docs: API diff report 22 to 23" into mnc-dev
Joe Fernandez [Fri, 14 Aug 2015 22:57:17 +0000 (22:57 +0000)]
Merge "docs: API diff report 22 to 23" into mnc-dev

8 years agoMerge "docs: Added Javadoc links for new M Preview permissions methods" into mnc-dev
Andrew Solovay [Fri, 14 Aug 2015 22:52:22 +0000 (22:52 +0000)]
Merge "docs: Added Javadoc links for new M Preview permissions methods" into mnc-dev

8 years agoMerge "Docs: Migration, rewrite of Doze/App Standby doc from M Preview behavior page...
David Friedman [Fri, 14 Aug 2015 22:49:39 +0000 (22:49 +0000)]
Merge "Docs: Migration, rewrite of Doze/App Standby doc from M Preview behavior page Bug: 22947123" into mnc-dev

8 years agoDocs: Migration, rewrite of Doze/App Standby doc from M Preview behavior page
David Friedman [Wed, 12 Aug 2015 17:24:14 +0000 (10:24 -0700)]
Docs: Migration, rewrite of Doze/App Standby doc from M Preview behavior page
Bug: 22947123

Change-Id: I49b72e160c40ea269a98a80356d61de49c306d96

8 years agodocs: Added Javadoc links for new M Preview permissions methods
Andrew Solovay [Fri, 14 Aug 2015 22:13:54 +0000 (15:13 -0700)]
docs: Added Javadoc links for new M Preview permissions methods

See first comment for doc stage location.

Change-Id: I6bf4c51e493d592a92d11028c2eeaac6afbc0954

8 years agodocs: API diff report 22 to 23
Joe Fernandez [Fri, 14 Aug 2015 22:24:43 +0000 (15:24 -0700)]
docs: API diff report 22 to 23

Change-Id: I7f8c5fb11e48520b91c90a8d26878b7413d3fb5b

8 years agoMerge "Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo...
Dianne Hackborn [Fri, 14 Aug 2015 22:17:50 +0000 (22:17 +0000)]
Merge "Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo..." into mnc-dev

8 years agoCamera2: Add camera type to getNumberOfCameras.
Eino-Ville Talvala [Fri, 14 Aug 2015 20:11:16 +0000 (13:11 -0700)]
Camera2: Add camera type to getNumberOfCameras.

Do not list strange cameras in old API; ensure new API gets all
cameras.

Bug: 23194168
Change-Id: Ia1fdffac245525674c913fefb1ec06e9094fe8d3

8 years agoMerge "cherrypick from mnc-preview-docs docs: Preview 3 permissions docs. Original...
Andrew Solovay [Fri, 14 Aug 2015 21:44:37 +0000 (21:44 +0000)]
Merge "cherrypick from mnc-preview-docs docs: Preview 3 permissions docs. Original Change-Id: I4eaf45d98846e2bf9456f5896da4ec3079f4ba18" into mnc-dev

8 years agoAdd debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo...
Dianne Hackborn [Fri, 14 Aug 2015 20:29:47 +0000 (13:29 -0700)]
Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo...

...from Camera360 to Hangouts }

In the short URI toString, include a small summary of the ClipData (instead
of just saying it has a clip data).  This makes it a lot easier to understand
what is happening when you look at the log of activity starts.

Also separate out the activity manager dump of URI permission grants from
its dump of providers, so it is easy to just look at that state.

Change-Id: I68093d9f279944e1aa9a29347075f237f4f55ed3

8 years agoMerge "AAPT: Fix regression in resource versioning" into mnc-dev
Adam Lesinski [Fri, 14 Aug 2015 20:46:49 +0000 (20:46 +0000)]
Merge "AAPT: Fix regression in resource versioning" into mnc-dev

8 years agoMerge "docs: Updated API Overview and Behavior Changes docs for M Preview 3." into...
Quddus Chong [Fri, 14 Aug 2015 20:44:54 +0000 (20:44 +0000)]
Merge "docs: Updated API Overview and Behavior Changes docs for M Preview 3." into mnc-dev

8 years agocherrypick from mnc-preview-docs docs: Preview 3 permissions docs.
Andrew Solovay [Wed, 22 Jul 2015 21:43:49 +0000 (14:43 -0700)]
cherrypick from mnc-preview-docs docs: Preview 3 permissions docs.
Original Change-Id: I4eaf45d98846e2bf9456f5896da4ec3079f4ba18

Added section describing the new support library methods. Also
updating lists of normal and dangerous permissions based on current
AndroidManifest in mnc-dev, as well as any other changes brought to my
attention.

See first comment for doc stage location.

Change-Id: I4eaf45d98846e2bf9456f5896da4ec3079f4ba18

8 years agoAAPT: Fix regression in resource versioning
Adam Lesinski [Fri, 14 Aug 2015 20:16:18 +0000 (13:16 -0700)]
AAPT: Fix regression in resource versioning

With a set of resources with the following configurations:

()
(land)

the regression caused any resources that needed to be versioned in configuration () to be lost.

Bug:23038206
Change-Id: I2f1b0313fb780ac241e7aaa487cb37dfb79c36aa

8 years agoMerge "Introducing M Land." into mnc-dev
Daniel Sandler [Fri, 14 Aug 2015 19:59:48 +0000 (19:59 +0000)]
Merge "Introducing M Land." into mnc-dev

8 years agoMerge ""I tried to think of the most harmless thing."" into mnc-dev
Daniel Sandler [Fri, 14 Aug 2015 19:59:35 +0000 (19:59 +0000)]
Merge ""I tried to think of the most harmless thing."" into mnc-dev

8 years agoIntroducing M Land.
Dan Sandler [Thu, 13 Aug 2015 17:30:55 +0000 (13:30 -0400)]
Introducing M Land.

The "M" is for Multiplayer.

Bug: 21984798
Change-Id: Id752b8efe54ff0ac38854a129188027137d64dd5

8 years agoam 504600bb: Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs...
Adam Lesinski [Fri, 14 Aug 2015 19:47:54 +0000 (19:47 +0000)]
am 504600bb: Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc-dev

* commit '504600bb09e51f0187d81cacb1dc2de77c6256b6':
  Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs

8 years agoMerge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc-dev
Adam Lesinski [Fri, 14 Aug 2015 19:38:34 +0000 (19:38 +0000)]
Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc-dev

8 years ago"I tried to think of the most harmless thing."
Dan Sandler [Mon, 3 Aug 2015 21:42:54 +0000 (17:42 -0400)]
"I tried to think of the most harmless thing."

Bug: 21984798
Change-Id: I33ffabb72c831ff814363601a82ac9a388cb1e99

8 years agoam 7df411d0: Merge "Clear calling identity before getting the current user." into...
Julia Reynolds [Fri, 14 Aug 2015 19:22:04 +0000 (19:22 +0000)]
am 7df411d0: Merge "Clear calling identity before getting the current user." into mnc-dev

* commit '7df411d0cced4a849bcdca58fa3c27eb731e0862':
  Clear calling identity before getting the current user.

8 years agoMerge "Clear calling identity before getting the current user." into mnc-dev
Julia Reynolds [Fri, 14 Aug 2015 19:17:31 +0000 (19:17 +0000)]
Merge "Clear calling identity before getting the current user." into mnc-dev

8 years agoStart pulse fading exactly when screen is turned on
Jorim Jaggi [Thu, 13 Aug 2015 01:35:42 +0000 (18:35 -0700)]
Start pulse fading exactly when screen is turned on

Bug: 23163299
Change-Id: I0f6d5dbfa02e455292e06a4f8f69ab68e9da2b6b

8 years agoam 16fa58cb: Merge "Fix to check the incoming userid argument for RingtonePlayer...
Jean-Michel Trivi [Fri, 14 Aug 2015 18:33:08 +0000 (18:33 +0000)]
am 16fa58cb: Merge "Fix to check the incoming userid argument for RingtonePlayer" into mnc-dev

* commit '16fa58cb133f539016a5e013897c7de7f58ff16d':
  Fix to check the incoming userid argument for RingtonePlayer

8 years agoMerge "Fix to check the incoming userid argument for RingtonePlayer" into mnc-dev
Jean-Michel Trivi [Fri, 14 Aug 2015 18:19:17 +0000 (18:19 +0000)]
Merge "Fix to check the incoming userid argument for RingtonePlayer" into mnc-dev