OSDN Git Service
Chris Craik [Tue, 26 May 2015 17:26:05 +0000 (17:26 +0000)]
am
87d8bb3d: Merge "Unflip TextureView getBitmap readback" into mnc-dev
* commit '
87d8bb3d85416c28545f94feb1db77875ebe9cf2':
Unflip TextureView getBitmap readback
Chet Haase [Tue, 26 May 2015 17:26:00 +0000 (17:26 +0000)]
am
1ddc95eb: Merge "Clarify example for Deep Share" into mnc-dev
* commit '
1ddc95ebb244660244681558d16325771ca56b3c':
Clarify example for Deep Share
Chris Craik [Tue, 26 May 2015 17:19:01 +0000 (17:19 +0000)]
Merge "Unflip TextureView getBitmap readback" into mnc-dev
Chet Haase [Tue, 26 May 2015 17:15:57 +0000 (17:15 +0000)]
Merge "Clarify example for Deep Share" into mnc-dev
Jason Monk [Tue, 26 May 2015 17:13:05 +0000 (17:13 +0000)]
am
80370952: Merge "QS: Only show summary for active wifi" into mnc-dev
* commit '
80370952e9008ba3949d6e9bc3412e62a05e1ba3':
QS: Only show summary for active wifi
Jason Monk [Tue, 26 May 2015 17:01:50 +0000 (17:01 +0000)]
Merge "QS: Only show summary for active wifi" into mnc-dev
Jason Monk [Tue, 26 May 2015 16:54:12 +0000 (12:54 -0400)]
QS: Only show summary for active wifi
Bug:
20432208
Change-Id: Iedf6e4d102e64c53a633f8d377b5eb57768b1f17
Jason Monk [Tue, 26 May 2015 16:41:46 +0000 (16:41 +0000)]
am
16224288: Merge "Add constants for permissions granted status api" into mnc-dev
* commit '
16224288791dd3f122931504e624637fdcc70903':
Add constants for permissions granted status api
Jason Monk [Tue, 26 May 2015 16:32:52 +0000 (16:32 +0000)]
Merge "Add constants for permissions granted status api" into mnc-dev
James Cook [Tue, 26 May 2015 16:29:42 +0000 (16:29 +0000)]
am
327c3641: Merge "Cancel voice assist session on user switch" into mnc-dev
* commit '
327c364113c18c9d5a05df0c912b65788461da41':
Cancel voice assist session on user switch
James Cook [Tue, 26 May 2015 16:16:34 +0000 (16:16 +0000)]
Merge "Cancel voice assist session on user switch" into mnc-dev
Joseph Wen [Tue, 26 May 2015 15:23:15 +0000 (15:23 +0000)]
am
f981ea95: Merge "Update Statement Service" into mnc-dev
* commit '
f981ea95f2e951a558f73fb941cf006423e52627':
Update Statement Service
Joseph Wen [Tue, 26 May 2015 15:11:08 +0000 (15:11 +0000)]
Merge "Update Statement Service" into mnc-dev
dcashman [Tue, 26 May 2015 15:04:37 +0000 (15:04 +0000)]
am
b7b7b5ec: Merge "Set error code on failed keyset manifest parsing." into mnc-dev
* commit '
b7b7b5ece86e32a7e5636d0c41c3dee373e8ac5a':
Set error code on failed keyset manifest parsing.
dcashman [Tue, 26 May 2015 14:57:24 +0000 (14:57 +0000)]
Merge "Set error code on failed keyset manifest parsing." into mnc-dev
Jason Monk [Fri, 22 May 2015 18:50:21 +0000 (14:50 -0400)]
Add constants for permissions granted status api
Bug:
21078474
Change-Id: I6b0bcf0c11258ae263eb08366c14f9298798afdb
Lorenzo Colitti [Tue, 26 May 2015 12:52:14 +0000 (12:52 +0000)]
am
82babcd8: Specify more information in DhcpClient PendingIntents.
* commit '
82babcd83a568f9e938bf8b6b3b86b65e8b30e1f':
Specify more information in DhcpClient PendingIntents.
Lorenzo Colitti [Tue, 26 May 2015 08:31:47 +0000 (17:31 +0900)]
Specify more information in DhcpClient PendingIntents.
- Specify the package name. This provides a bit of security, but
not much since the package is "android".
- Specify the interface name so we can run more than one client
at a time.
Bug:
21395858
Bug:
19704592
Change-Id: I91c9ea15285b36628b6aef0b975c16a0b08d061e
Martijn Coenen [Tue, 26 May 2015 09:36:25 +0000 (09:36 +0000)]
am
99fbb56a: Merge "Don\'t count lowmem mappings as memory used." into mnc-dev
* commit '
99fbb56a0ab81ead404480f0c2df529332a93a32':
Don't count lowmem mappings as memory used.
Martijn Coenen [Tue, 26 May 2015 08:11:26 +0000 (08:11 +0000)]
Merge "Don't count lowmem mappings as memory used." into mnc-dev
Selim Cinek [Tue, 26 May 2015 07:40:59 +0000 (07:40 +0000)]
am
912696e7: Merge "Fixed logspam and handling subwindows with the input consumer" into mnc-dev
* commit '
912696e79785ad26bb2f27354bedce1739f311e3':
Fixed logspam and handling subwindows with the input consumer
Selim Cinek [Tue, 26 May 2015 07:34:17 +0000 (07:34 +0000)]
Merge "Fixed logspam and handling subwindows with the input consumer" into mnc-dev
David Friedman [Tue, 26 May 2015 06:17:14 +0000 (06:17 +0000)]
am
35bf8322: am
515444ff: am
db9274e7: am
f8cd49ae: am
d580302d: Docs: Submitting fix for build-breaking CL 695942.
* commit '
35bf832248984f92da8de9700ec34ac5e032e116':
Docs: Submitting fix for build-breaking CL 695942.
David Friedman [Tue, 26 May 2015 06:17:08 +0000 (06:17 +0000)]
am
337089c8: am
e0f14f48: am
c25ff8e2: am
e11744fe: am
4a6d5c93: Docs: Sample-walkthrough chapters for NDK documentation
* commit '
337089c8d1dc974a24b971fd3e0894086a4e2767':
Docs: Sample-walkthrough chapters for NDK documentation
Oliver Woodman [Tue, 26 May 2015 06:12:52 +0000 (06:12 +0000)]
am
b4ad97fc: am
a61df8f6: am
056bc731: am
1ddb7cae: am
eb09fe5e: Merge "Remove most of ExoPlayer page, replacing it with links to ExoPlayer site." into lmp-docs
* commit '
b4ad97fc193e1a2d5e6254298f176742fbdfddb7':
Remove most of ExoPlayer page, replacing it with links to ExoPlayer site.
Johan Euphrosine [Tue, 26 May 2015 06:12:47 +0000 (06:12 +0000)]
am
be0742e8: am
4170d9e0: am
165d4585: am
1ccbe54f: am
46350fea: frameworks/base/docs/ndk: add missing doxygen css
* commit '
be0742e8ee5cf1fe5cce2788c888171452ffe299':
frameworks/base/docs/ndk: add missing doxygen css
David Friedman [Tue, 26 May 2015 06:04:54 +0000 (06:04 +0000)]
am
515444ff: am
db9274e7: am
f8cd49ae: am
d580302d: Docs: Submitting fix for build-breaking CL 695942.
* commit '
515444ff434ff93c7b5c24bc356973f385e39adf':
Docs: Submitting fix for build-breaking CL 695942.
David Friedman [Tue, 26 May 2015 06:04:49 +0000 (06:04 +0000)]
am
e0f14f48: am
c25ff8e2: am
e11744fe: am
4a6d5c93: Docs: Sample-walkthrough chapters for NDK documentation
* commit '
e0f14f48416484029a478e17e6b2c5708e0e0010':
Docs: Sample-walkthrough chapters for NDK documentation
Oliver Woodman [Tue, 26 May 2015 06:04:44 +0000 (06:04 +0000)]
am
a61df8f6: am
056bc731: am
1ddb7cae: am
eb09fe5e: Merge "Remove most of ExoPlayer page, replacing it with links to ExoPlayer site." into lmp-docs
* commit '
a61df8f63c55d96c5443449a9fb538ad97224a52':
Remove most of ExoPlayer page, replacing it with links to ExoPlayer site.
Johan Euphrosine [Tue, 26 May 2015 06:04:38 +0000 (06:04 +0000)]
am
4170d9e0: am
165d4585: am
1ccbe54f: am
46350fea: frameworks/base/docs/ndk: add missing doxygen css
* commit '
4170d9e05b5477d75e4d8a12718e5d7b6aff3cdd':
frameworks/base/docs/ndk: add missing doxygen css
David Friedman [Tue, 26 May 2015 05:53:08 +0000 (05:53 +0000)]
am
db9274e7: am
f8cd49ae: am
d580302d: Docs: Submitting fix for build-breaking CL 695942.
* commit '
db9274e70fcedc21d08abe340e7ef47d35258e50':
Docs: Submitting fix for build-breaking CL 695942.
David Friedman [Tue, 26 May 2015 05:53:03 +0000 (05:53 +0000)]
am
c25ff8e2: am
e11744fe: am
4a6d5c93: Docs: Sample-walkthrough chapters for NDK documentation
* commit '
c25ff8e2513e78b5e22d30b6fe513fdfb2f63643':
Docs: Sample-walkthrough chapters for NDK documentation
Oliver Woodman [Tue, 26 May 2015 05:52:59 +0000 (05:52 +0000)]
am
056bc731: am
1ddb7cae: am
eb09fe5e: Merge "Remove most of ExoPlayer page, replacing it with links to ExoPlayer site." into lmp-docs
* commit '
056bc731ca7a53067027b0e72f58779aaf3c558a':
Remove most of ExoPlayer page, replacing it with links to ExoPlayer site.
Johan Euphrosine [Tue, 26 May 2015 05:52:54 +0000 (05:52 +0000)]
am
165d4585: am
1ccbe54f: am
46350fea: frameworks/base/docs/ndk: add missing doxygen css
* commit '
165d4585605f0fd7bcab798d9759f465ce4dca44':
frameworks/base/docs/ndk: add missing doxygen css
David Friedman [Tue, 26 May 2015 05:42:13 +0000 (05:42 +0000)]
am
f8cd49ae: am
d580302d: Docs: Submitting fix for build-breaking CL 695942.
* commit '
f8cd49ae178a29471d1424726b23a593e9ab43a1':
Docs: Submitting fix for build-breaking CL 695942.
David Friedman [Tue, 26 May 2015 05:37:15 +0000 (05:37 +0000)]
am
e11744fe: am
4a6d5c93: Docs: Sample-walkthrough chapters for NDK documentation
* commit '
e11744fefdb1678dc369a7fea5aaaf0a290fb697':
Docs: Sample-walkthrough chapters for NDK documentation
Oliver Woodman [Tue, 26 May 2015 05:37:07 +0000 (05:37 +0000)]
am
1ddb7cae: am
eb09fe5e: Merge "Remove most of ExoPlayer page, replacing it with links to ExoPlayer site." into lmp-docs
* commit '
1ddb7caedba247aa9174fc6c78c4ea6b3b4f5a89':
Remove most of ExoPlayer page, replacing it with links to ExoPlayer site.
Johan Euphrosine [Tue, 26 May 2015 05:37:01 +0000 (05:37 +0000)]
am
1ccbe54f: am
46350fea: frameworks/base/docs/ndk: add missing doxygen css
* commit '
1ccbe54f2d651df7b9f9e5dfd3b58eaa2d92a9c8':
frameworks/base/docs/ndk: add missing doxygen css
David Friedman [Tue, 26 May 2015 05:26:58 +0000 (05:26 +0000)]
am
d580302d: Docs: Submitting fix for build-breaking CL 695942.
* commit '
d580302d622e4583c7ab2db8759ea8036614df6e':
Docs: Submitting fix for build-breaking CL 695942.
David Friedman [Tue, 26 May 2015 04:53:23 +0000 (21:53 -0700)]
Docs: Submitting fix for build-breaking CL 695942.
Change-Id: Ic384cfca07f7317c07e33d584340f1678a9f99e4
Adrian Roos [Tue, 26 May 2015 01:19:40 +0000 (01:19 +0000)]
am
47cfee9d: Fix initial keyguard user switcher state
* commit '
47cfee9d037584bed724f9786d10f85b048e58d0':
Fix initial keyguard user switcher state
Adrian Roos [Tue, 26 May 2015 01:09:13 +0000 (18:09 -0700)]
Fix initial keyguard user switcher state
Bug:
18411080
Change-Id: I506968ee6101069361d83f7ef386802f5856a68e
Guang Zhu [Mon, 25 May 2015 19:44:14 +0000 (19:44 +0000)]
am
20c8fcaa: Merge "update app compatibility post launch detection" into mnc-dev
* commit '
20c8fcaae502b5b3064227a8a804ce1d88c6a2b0':
update app compatibility post launch detection
Dirk Dougherty [Mon, 25 May 2015 19:44:08 +0000 (19:44 +0000)]
am
b9bc9720: am
31a84561: am
0417dbac: Merge "Doc change: remove older diffs from static server hosting. Requests will redirect to downloadable zips in cloud storage." into mnc-preview-docs
* commit '
b9bc972011b7c5de0a2034979c9e6f58345f01fe':
Doc change: remove older diffs from static server hosting. Requests will redirect to downloadable zips in cloud storage.
Guang Zhu [Mon, 25 May 2015 19:38:40 +0000 (19:38 +0000)]
Merge "update app compatibility post launch detection" into mnc-dev
Dirk Dougherty [Mon, 25 May 2015 19:32:10 +0000 (19:32 +0000)]
am
31a84561: am
0417dbac: Merge "Doc change: remove older diffs from static server hosting. Requests will redirect to downloadable zips in cloud storage." into mnc-preview-docs
* commit '
31a84561ee28278ee0995c6cc27054b96372041f':
Doc change: remove older diffs from static server hosting. Requests will redirect to downloadable zips in cloud storage.
Dirk Dougherty [Mon, 25 May 2015 19:19:50 +0000 (19:19 +0000)]
am
0417dbac: Merge "Doc change: remove older diffs from static server hosting. Requests will redirect to downloadable zips in cloud storage." into mnc-preview-docs
* commit '
0417dbac1358661e2101e7ff1c9a873c59714bb9':
Doc change: remove older diffs from static server hosting. Requests will redirect to downloadable zips in cloud storage.
Guang Zhu [Mon, 25 May 2015 19:09:12 +0000 (12:09 -0700)]
update app compatibility post launch detection
decide if the app is still running after launch by checking
running tasks and look for a task with base activity belonging
to the package launched.
Change-Id: Ibb3894e765ccbca62f803decc3c1c1f36dc2d454
Dirk Dougherty [Mon, 25 May 2015 19:07:23 +0000 (19:07 +0000)]
Merge "Doc change: remove older diffs from static server hosting. Requests will redirect to downloadable zips in cloud storage." into mnc-preview-docs
Geoff Mendal [Mon, 25 May 2015 18:20:58 +0000 (18:20 +0000)]
am
47e745c9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
47e745c9786f757c2351e7192b7cd76527b95861':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 25 May 2015 18:09:36 +0000 (18:09 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 25 May 2015 18:03:26 +0000 (11:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8918640ef803392c6ac66b2293d1a67841bbfaa3
Auto-generated-cl: translation import
Chet Haase [Mon, 25 May 2015 15:47:36 +0000 (08:47 -0700)]
Clarify example for Deep Share
Changed name of service to avoid using the actual class name
ChooserTargetService as the example service's name.
Issue #
21418354 Clarify doc example for ChooserTargetService
Change-Id: I59bf67299fe7a8307504baf5e999c14f84a1e50d
Geoff Mendal [Mon, 25 May 2015 15:16:53 +0000 (15:16 +0000)]
am
c38fbbe1: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
c38fbbe1033a7206ebd80765cc8df49a6bc0693d':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 25 May 2015 15:07:39 +0000 (15:07 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 25 May 2015 15:05:44 +0000 (10:05 -0500)]
Import translations. DO NOT MERGE
Change-Id: I9662a21a18c78c1599c7ebf55300f22b2df1a458
Auto-generated-cl: translation import
Geoff Mendal [Mon, 25 May 2015 15:04:07 +0000 (15:04 +0000)]
am
32156a75: (-s ours) Import translations. DO NOT MERGE
* commit '
32156a7586c5f33d9787074b093cffb317c11f3d':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 25 May 2015 14:53:44 +0000 (09:53 -0500)]
Import translations. DO NOT MERGE
Change-Id: Id4da8170bceabc117824f81c25a6019f5584ce0b
Auto-generated-cl: translation import
David Friedman [Mon, 25 May 2015 07:00:32 +0000 (07:00 +0000)]
am
4a6d5c93: Docs: Sample-walkthrough chapters for NDK documentation
* commit '
4a6d5c9399179abcef7877c43f46855152129bd3':
Docs: Sample-walkthrough chapters for NDK documentation
David Friedman [Fri, 22 May 2015 09:31:51 +0000 (02:31 -0700)]
Docs: Sample-walkthrough chapters for NDK documentation
Change-Id: If7422f36d5489271776c7ed085059502e1cdebea
Dirk Dougherty [Sun, 24 May 2015 14:20:16 +0000 (14:20 +0000)]
am
26aba8de: am
82159cd5: am
10d44b75: Doc change: Updates to preview and distribute.
* commit '
26aba8dee401f20983d1499feb055008489f0f1a':
Doc change: Updates to preview and distribute.
Dirk Dougherty [Sun, 24 May 2015 13:57:08 +0000 (13:57 +0000)]
am
82159cd5: am
10d44b75: Doc change: Updates to preview and distribute.
* commit '
82159cd537c706f3dd7e33d0683705ebccffc370':
Doc change: Updates to preview and distribute.
Dirk Dougherty [Sun, 24 May 2015 12:31:01 +0000 (12:31 +0000)]
am
10d44b75: Doc change: Updates to preview and distribute.
* commit '
10d44b7581b67d6619c7060ca1d339e0d355c7af':
Doc change: Updates to preview and distribute.
Dirk Dougherty [Sat, 23 May 2015 21:46:57 +0000 (14:46 -0700)]
Doc change: Updates to preview and distribute.
Change-Id: I097213ce68d50d10b23840f2ad61f26279293948
Dirk Dougherty [Sat, 23 May 2015 23:32:50 +0000 (16:32 -0700)]
Doc change: remove older diffs from static server hosting. Requests will redirect to downloadable zips in cloud storage.
Change-Id: Id3144b172808b1cde555d778f31ad5b4db0d941b
Svet Ganov [Sat, 23 May 2015 20:44:33 +0000 (20:44 +0000)]
am
a7590243: Merge "Hide pakcage installer system APIs." into mnc-dev
* commit '
a75902439403966b9308d38fcf5e51c20e43a583':
Hide pakcage installer system APIs.
Svet Ganov [Sat, 23 May 2015 20:31:54 +0000 (20:31 +0000)]
Merge "Hide pakcage installer system APIs." into mnc-dev
Svet Ganov [Sat, 23 May 2015 20:25:11 +0000 (13:25 -0700)]
Hide pakcage installer system APIs.
Change-Id: If5245ed2be7a3ebb50a7af924be85894314f6f47
Oliver Woodman [Sat, 23 May 2015 11:29:02 +0000 (11:29 +0000)]
am
eb09fe5e: Merge "Remove most of ExoPlayer page, replacing it with links to ExoPlayer site." into lmp-docs
* commit '
eb09fe5e3a9911daf4cb8e95145d2a6936aa189d':
Remove most of ExoPlayer page, replacing it with links to ExoPlayer site.
Oliver Woodman [Sat, 23 May 2015 11:15:34 +0000 (11:15 +0000)]
Merge "Remove most of ExoPlayer page, replacing it with links to ExoPlayer site." into lmp-docs
Joe Fernandez [Sat, 23 May 2015 10:33:46 +0000 (10:33 +0000)]
am
75a3f34e: am
3b521a6a: am
38097510: docs: M Preview - Automatic Backups (Dolly) page
* commit '
75a3f34e7616167dfc0979470523ed3c333dd85a':
docs: M Preview - Automatic Backups (Dolly) page
Joe Fernandez [Sat, 23 May 2015 10:22:21 +0000 (10:22 +0000)]
am
3b521a6a: am
38097510: docs: M Preview - Automatic Backups (Dolly) page
* commit '
3b521a6ad53710171efee6c2ea72b4c3c5f37101':
docs: M Preview - Automatic Backups (Dolly) page
Joe Fernandez [Sat, 23 May 2015 10:08:49 +0000 (10:08 +0000)]
am
38097510: docs: M Preview - Automatic Backups (Dolly) page
* commit '
380975104a9246c4f72f7882d855aec524267b6f':
docs: M Preview - Automatic Backups (Dolly) page
Joe Fernandez [Wed, 13 May 2015 08:13:51 +0000 (01:13 -0700)]
docs: M Preview - Automatic Backups (Dolly) page
Change-Id: Ia9e6815271f5f22d6f11f1d61e68b6670f51a53d
Joe Fernandez [Sat, 23 May 2015 09:51:33 +0000 (09:51 +0000)]
am
d7c91c0d: am
08162fec: am
84fff53c: Merge "docs: M Preview - update the preview section TOC" into mnc-preview-docs
* commit '
d7c91c0d07f81a38a421552186346787dca24873':
docs: M Preview - update the preview section TOC
Joe Fernandez [Sat, 23 May 2015 09:39:38 +0000 (09:39 +0000)]
am
08162fec: am
84fff53c: Merge "docs: M Preview - update the preview section TOC" into mnc-preview-docs
* commit '
08162fec0c6fe49dbc190457e9a898c961467b60':
docs: M Preview - update the preview section TOC
Joe Fernandez [Sat, 23 May 2015 08:03:24 +0000 (08:03 +0000)]
am
84fff53c: Merge "docs: M Preview - update the preview section TOC" into mnc-preview-docs
* commit '
84fff53cd73ed017ed1f9342d39cc496fe74cac2':
docs: M Preview - update the preview section TOC
Joe Fernandez [Sat, 23 May 2015 07:50:48 +0000 (07:50 +0000)]
Merge "docs: M Preview - update the preview section TOC" into mnc-preview-docs
Joe Fernandez [Sat, 16 May 2015 00:38:39 +0000 (17:38 -0700)]
docs: M Preview - update the preview section TOC
Change-Id: I5776d367df3baec13aee27a8e920de9d9b69782d
Johan Euphrosine [Sat, 23 May 2015 04:56:55 +0000 (04:56 +0000)]
am
5940f4bd: am
33a4f81e: am
6a7406bc: frameworks/base/docs/ndk: fix typo in landing page
* commit '
5940f4bd997a2da552073e92fc15971bc2834e5b':
frameworks/base/docs/ndk: fix typo in landing page
Johan Euphrosine [Sat, 23 May 2015 04:45:32 +0000 (04:45 +0000)]
am
33a4f81e: am
6a7406bc: frameworks/base/docs/ndk: fix typo in landing page
* commit '
33a4f81edbb0047aef34126e6d584b168d992862':
frameworks/base/docs/ndk: fix typo in landing page
Johan Euphrosine [Sat, 23 May 2015 04:33:18 +0000 (04:33 +0000)]
am
6a7406bc: frameworks/base/docs/ndk: fix typo in landing page
* commit '
6a7406bc1787d0b555ca3a3226a291d42554a94c':
frameworks/base/docs/ndk: fix typo in landing page
Selim Cinek [Sat, 23 May 2015 01:56:22 +0000 (18:56 -0700)]
Fixed logspam and handling subwindows with the input consumer
Bug:
21402648
Change-Id: I4c1c73487dfd19ba452ff2077d8541547f149c3b
Joe Fernandez [Sat, 23 May 2015 01:29:36 +0000 (01:29 +0000)]
am
801ca67c: am
528cf52e: am
6cf938c3: Merge "docs: Add sample links and descriptions for M Preview" into mnc-preview-docs
* commit '
801ca67cb6b85c2ad17106d8cad4cc7bff8ea4e0':
docs: Add sample links and descriptions for M Preview
Deepanshu Gupta [Sat, 23 May 2015 01:29:31 +0000 (01:29 +0000)]
am
d0acf062: Merge "Revert "Fix build."" into mnc-dev
* commit '
d0acf0627aa5f78cbf5bb189c7097546b86abebc':
Revert "Fix build."
Jean-Michel Trivi [Sat, 23 May 2015 01:29:26 +0000 (01:29 +0000)]
am
ed77bc09: Merge "More android.media.AudioFormat javadoc" into mnc-dev
* commit '
ed77bc09879784a56c60f215f267adc100213ed2':
More android.media.AudioFormat javadoc
Joe Fernandez [Sat, 23 May 2015 01:22:10 +0000 (01:22 +0000)]
am
528cf52e: am
6cf938c3: Merge "docs: Add sample links and descriptions for M Preview" into mnc-preview-docs
* commit '
528cf52e76c340caf2f0f9e6ef5b84ab4bd5b887':
docs: Add sample links and descriptions for M Preview
Deepanshu Gupta [Sat, 23 May 2015 01:21:09 +0000 (01:21 +0000)]
Merge "Revert "Fix build."" into mnc-dev
Deepanshu Gupta [Sat, 23 May 2015 01:19:23 +0000 (01:19 +0000)]
Revert "Fix build."
This reverts commit
97b3ae1a8766616675ebf2323a97d8adfd41bfdc.
Reverted since
4bb6b751fbbb218e8a298db4aa008472a0aa8d31 reverts
the commit that warranted this change.
Change-Id: I56d0eb8ffba44a673ae357e9543dd18f6c03c54f
Jean-Michel Trivi [Sat, 23 May 2015 01:19:01 +0000 (01:19 +0000)]
Merge "More android.media.AudioFormat javadoc" into mnc-dev
Jean-Michel Trivi [Thu, 21 May 2015 22:51:15 +0000 (15:51 -0700)]
More android.media.AudioFormat javadoc
More doc about AudioFormat constants, use of the builder,
sample rate, channel masks (position vs index, examples)
Bug
20921159
Change-Id: Ie60c2f3558b8b6008c6d9fb646ad9f6de396859d
Joe Fernandez [Sat, 23 May 2015 01:09:02 +0000 (01:09 +0000)]
am
6cf938c3: Merge "docs: Add sample links and descriptions for M Preview" into mnc-preview-docs
* commit '
6cf938c3021dd3492b43de6ee2664609e041a0c8':
docs: Add sample links and descriptions for M Preview
Johan Euphrosine [Sat, 23 May 2015 01:01:57 +0000 (18:01 -0700)]
frameworks/base/docs/ndk: fix typo in landing page
Change-Id: Ie792506b73e85dd58ebf481339801aa1d8036031
Joe Fernandez [Sat, 23 May 2015 00:57:21 +0000 (00:57 +0000)]
Merge "docs: Add sample links and descriptions for M Preview" into mnc-preview-docs
Chris Craik [Sat, 23 May 2015 00:18:54 +0000 (17:18 -0700)]
Unflip TextureView getBitmap readback
bug:
20165725
Change-Id: I09035f43be140145c54221d6865206ce486994c9
Dianne Hackborn [Sat, 23 May 2015 00:44:55 +0000 (00:44 +0000)]
am
dd5ee4b8: Merge "Revert "resolved conflicts for merge of
47249f2a to mnc-dev"" into mnc-dev
* commit '
dd5ee4b89083ec9b50b8c9739274136b0c74abb5':
Revert "resolved conflicts for merge of
47249f2a to mnc-dev"
Dianne Hackborn [Sat, 23 May 2015 00:34:34 +0000 (00:34 +0000)]
Merge "Revert "resolved conflicts for merge of
47249f2a to mnc-dev"" into mnc-dev
Simranjit Singh Kohli [Sat, 23 May 2015 00:33:32 +0000 (00:33 +0000)]
am
aefdaa5c: Merge "[ChooseAccount/AccountManager.newChooseAccountIntent Bug Fixes]" into mnc-dev
* commit '
aefdaa5cbd2a68aa6c8e7d229b897237562cebcb':
[ChooseAccount/AccountManager.newChooseAccountIntent Bug Fixes]
Dirk Dougherty [Sat, 23 May 2015 00:33:26 +0000 (00:33 +0000)]
am
8f51279d: am
c56a8313: am
b1410bc3: Merge "Doc change: updates for preview." into mnc-preview-docs
* commit '
8f51279d50fab3270e1c13dc65c4e38a3a735ef6':
Doc change: updates for preview.
Joe Fernandez [Sat, 23 May 2015 00:33:21 +0000 (00:33 +0000)]
am
8cdd693a: am
93cc5190: am
b373f49a: docs: NDK table of contents fixes
* commit '
8cdd693ae1ed41ae175df79f77492743444a8d24':
docs: NDK table of contents fixes
OSDN Git Service
