OSDN Git Service
Dirk Dougherty [Sun, 24 May 2015 14:47:36 +0000 (14:47 +0000)]
am
d8bd7dd9: am
26aba8de: am
82159cd5: am
10d44b75: Doc change: Updates to preview and distribute.
* commit '
d8bd7dd97fec6dcc82a8376cf5cb060e80143ddb':
Doc change: Updates to preview and distribute.
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
Svet Ganov [Sat, 23 May 2015 20:55:51 +0000 (20:55 +0000)]
am
43e181d0: am
a7590243: Merge "Hide pakcage installer system APIs." into mnc-dev
* commit '
43e181d0fb9fb91db20fdb54a33ad9b33d7f19c9':
Hide pakcage installer system APIs.
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
Joe Fernandez [Sat, 23 May 2015 10:44:57 +0000 (10:44 +0000)]
am
eef2f6f4: am
75a3f34e: am
3b521a6a: am
38097510: docs: M Preview - Automatic Backups (Dolly) page
* commit '
eef2f6f4103ac1a3f385708bd45930d0306f6f46':
docs: M Preview - Automatic Backups (Dolly) page
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 [Sat, 23 May 2015 10:03:12 +0000 (10:03 +0000)]
am
9f61dc8b: am
d7c91c0d: am
08162fec: am
84fff53c: Merge "docs: M Preview - update the preview section TOC" into mnc-preview-docs
* commit '
9f61dc8b8a0ac9c738f007e0b7f69d9e08d2a9e5':
docs: M Preview - update the preview section TOC
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 05:08:35 +0000 (05:08 +0000)]
am
c8aaab82: am
5940f4bd: am
33a4f81e: am
6a7406bc: frameworks/base/docs/ndk: fix typo in landing page
* commit '
c8aaab82a408598982b5bba1c9e5669ae81aea17':
frameworks/base/docs/ndk: fix typo in landing page
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
Joe Fernandez [Sat, 23 May 2015 01:41:20 +0000 (01:41 +0000)]
am
5365ad4a: am
801ca67c: am
528cf52e: am
6cf938c3: Merge "docs: Add sample links and descriptions for M Preview" into mnc-preview-docs
* commit '
5365ad4a154ef45267a145c91d7e3f4e88d385e2':
docs: Add sample links and descriptions for M Preview
Deepanshu Gupta [Sat, 23 May 2015 01:41:15 +0000 (01:41 +0000)]
am
f2ec459d: am
d0acf062: Merge "Revert "Fix build."" into mnc-dev
* commit '
f2ec459d853cb1a47138d00c7123dd1b83363462':
Revert "Fix build."
Jean-Michel Trivi [Sat, 23 May 2015 01:41:10 +0000 (01:41 +0000)]
am
2d72ded2: am
ed77bc09: Merge "More android.media.AudioFormat javadoc" into mnc-dev
* commit '
2d72ded27cd4ce78a42bb4c0d73cb2fc3c3cf3e3':
More android.media.AudioFormat javadoc
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
Dianne Hackborn [Sat, 23 May 2015 00:58:27 +0000 (00:58 +0000)]
am
54d803c0: am
dd5ee4b8: Merge "Revert "resolved conflicts for merge of
47249f2a to mnc-dev"" into mnc-dev
* commit '
54d803c0274137998c7dbb9d7b8af58de13be5b6':
Revert "resolved conflicts for merge of
47249f2a to mnc-dev"
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
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"
Simranjit Singh Kohli [Sat, 23 May 2015 00:44:24 +0000 (00:44 +0000)]
am
c2e945ba: am
aefdaa5c: Merge "[ChooseAccount/AccountManager.newChooseAccountIntent Bug Fixes]" into mnc-dev
* commit '
c2e945ba37ecb09c640de88abbcc60f5ad76efb8':
[ChooseAccount/AccountManager.newChooseAccountIntent Bug Fixes]
Dirk Dougherty [Sat, 23 May 2015 00:44:17 +0000 (00:44 +0000)]
am
e54887a0: am
8f51279d: am
c56a8313: am
b1410bc3: Merge "Doc change: updates for preview." into mnc-preview-docs
* commit '
e54887a085969743f8c91b7b34bbcf9aa441a9e8':
Doc change: updates for preview.
Joe Fernandez [Sat, 23 May 2015 00:44:12 +0000 (00:44 +0000)]
am
9c06916e: am
8cdd693a: am
93cc5190: am
b373f49a: docs: NDK table of contents fixes
* commit '
9c06916e79751213f8954036f56922d356536c0f':
docs: NDK table of contents fixes
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
Amith Yamasani [Sat, 23 May 2015 00:26:32 +0000 (00:26 +0000)]
am
031f1bc9: am
7870550a: Merge "Add getPermissionGrantState method in device policy" into mnc-dev
* commit '
031f1bc9ee6d79591e4bf2c4c30d616e87fc6f6b':
Add getPermissionGrantState method in device policy
Simranjit Singh Kohli [Sat, 23 May 2015 00:20:38 +0000 (00:20 +0000)]
Merge "[ChooseAccount/AccountManager.newChooseAccountIntent Bug Fixes]" into mnc-dev
Dirk Dougherty [Sat, 23 May 2015 00:19:53 +0000 (00:19 +0000)]
am
c56a8313: am
b1410bc3: Merge "Doc change: updates for preview." into mnc-preview-docs
* commit '
c56a8313760243740b684fef4ae71d791a885b4d':
Doc change: updates for preview.
Joe Fernandez [Sat, 23 May 2015 00:19:48 +0000 (00:19 +0000)]
am
93cc5190: am
b373f49a: docs: NDK table of contents fixes
* commit '
93cc51908c6d57d43f5a2ae98a850aaa67ac6b64':
docs: NDK table of contents fixes
Simranjit Singh Kohli [Fri, 22 May 2015 21:00:32 +0000 (14:00 -0700)]
[ChooseAccount/AccountManager.newChooseAccountIntent Bug Fixes]
Fixing lots of bugs related to the ChooseAccount Activities.
1. Fix jank which is seen when no accounts are present on the device.
2. After addition of the account, return to the user.
3. Don't crash when the user provides null to allowableAccountTypes.
4. Updated documentation of AccountManager#newChooseAccountIntent.
5. Fix NPE.
Bug:
13104800
Bug:
17926560
Bug:
9626001
Change-Id: I0d1913e46560cfb458526a7c930a38049602d8f1
Amith Yamasani [Sat, 23 May 2015 00:12:56 +0000 (00:12 +0000)]
am
7870550a: Merge "Add getPermissionGrantState method in device policy" into mnc-dev
* commit '
7870550a1b6e1110bf461633970e439d0243a868':
Add getPermissionGrantState method in device policy
Dirk Dougherty [Sat, 23 May 2015 00:08:42 +0000 (00:08 +0000)]
am
b1410bc3: Merge "Doc change: updates for preview." into mnc-preview-docs
* commit '
b1410bc306195dc807f223bc5955780275fc6468':
Doc change: updates for preview.
Joe Fernandez [Sat, 23 May 2015 00:08:36 +0000 (00:08 +0000)]
am
b373f49a: docs: NDK table of contents fixes
* commit '
b373f49a85fcbe82993940416ce04e0a1fb1e340':
docs: NDK table of contents fixes
Amith Yamasani [Sat, 23 May 2015 00:05:46 +0000 (00:05 +0000)]
Merge "Add getPermissionGrantState method in device policy" into mnc-dev
Dirk Dougherty [Fri, 22 May 2015 23:59:16 +0000 (23:59 +0000)]
Merge "Doc change: updates for preview." into mnc-preview-docs
Dirk Dougherty [Fri, 22 May 2015 23:58:14 +0000 (16:58 -0700)]
Doc change: updates for preview.
Change-Id: Ie741785ae4b21373fa49dbd7f725cab1f812891a
Yin-Chia Yeh [Fri, 22 May 2015 23:55:12 +0000 (23:55 +0000)]
am
5c4def8a: am
5cf9d8ac: Merge "Camera: update available LSC map mode key type" into mnc-dev
* commit '
5c4def8acda8124da2637a590bcf4ee0cd2ecd3c':
Camera: update available LSC map mode key type
Dirk Dougherty [Fri, 22 May 2015 23:55:06 +0000 (23:55 +0000)]
am
70c5809e: am
e511bab4: am
09ffc01d: am
61e6be64: Merge "Doc change: updates for preview content." into mnc-preview-docs
* commit '
70c5809e23a668443c787968e673739fcae8d247':
Doc change: updates for preview content.
Joe Fernandez [Fri, 22 May 2015 19:27:04 +0000 (12:27 -0700)]
docs: NDK table of contents fixes
- fixing the encoding of the left navigation files for
- Guides
- References
- Samples
- Downloads
Change-Id: Ic3a45ff661f1c8e5784e833047764fecc6445cae
Yin-Chia Yeh [Fri, 22 May 2015 23:48:23 +0000 (23:48 +0000)]
am
5cf9d8ac: Merge "Camera: update available LSC map mode key type" into mnc-dev
* commit '
5cf9d8ac94f4a3e00ef32c382950a9cd5e8fd4a7':
Camera: update available LSC map mode key type
Dirk Dougherty [Fri, 22 May 2015 23:42:08 +0000 (23:42 +0000)]
am
e511bab4: am
09ffc01d: am
61e6be64: Merge "Doc change: updates for preview content." into mnc-preview-docs
* commit '
e511bab48d6d0b1684c8c29af0aae43cec6c57ed':
Doc change: updates for preview content.
Yin-Chia Yeh [Fri, 22 May 2015 23:40:31 +0000 (23:40 +0000)]
Merge "Camera: update available LSC map mode key type" into mnc-dev
Yin-Chia Yeh [Fri, 22 May 2015 23:37:27 +0000 (16:37 -0700)]
Camera: update available LSC map mode key type
Bug:
21403373
Change-Id: I37101e2d0ef5cb8d66676dcdb16938ac8fe85c64
Dianne Hackborn [Fri, 22 May 2015 23:34:44 +0000 (16:34 -0700)]
Revert "resolved conflicts for merge of
47249f2a to mnc-dev"
This reverts commit
c7becb7ee78881646251ff4846e63eb6b96bf7ec, reversing
changes made to
8562b08f04c1309cf40db1e749d612b6824f1d12.
Dirk Dougherty [Fri, 22 May 2015 23:29:29 +0000 (23:29 +0000)]
am
09ffc01d: am
61e6be64: Merge "Doc change: updates for preview content." into mnc-preview-docs
* commit '
09ffc01dd3bfd21410d4d620ca8f8c40d4688a86':
Doc change: updates for preview content.
Dirk Dougherty [Fri, 22 May 2015 23:14:47 +0000 (23:14 +0000)]
am
61e6be64: Merge "Doc change: updates for preview content." into mnc-preview-docs
* commit '
61e6be640b1e5d6ae4cacf0a2e62a7f66f42202c':
Doc change: updates for preview content.
David Friedman [Fri, 22 May 2015 23:12:04 +0000 (23:12 +0000)]
am
4885abd2: am
4cb03fa0: am
eed8e782: am
dd4dc4a0: resolved conflicts for merge of
7044ee16 to mnc-preview-docs
* commit '
4885abd258ff72c477b8d75aab96422e376466eb':
Docs: Final CL for NDK-docs-onto-DAC, pulling all files into a single CL.
Dirk Dougherty [Fri, 22 May 2015 23:05:13 +0000 (23:05 +0000)]
Merge "Doc change: updates for preview content." into mnc-preview-docs
Dirk Dougherty [Fri, 22 May 2015 17:23:10 +0000 (10:23 -0700)]
Doc change: updates for preview content.
Change-Id: Ife06f0e5b3ef6950d5d6fe452940c8dd87ed89ea
David Friedman [Fri, 22 May 2015 22:57:20 +0000 (22:57 +0000)]
am
4cb03fa0: am
eed8e782: am
dd4dc4a0: resolved conflicts for merge of
7044ee16 to mnc-preview-docs
* commit '
4cb03fa059d0145e81e624fddc4b57cb471bd786':
Docs: Final CL for NDK-docs-onto-DAC, pulling all files into a single CL.
David Friedman [Fri, 22 May 2015 22:45:35 +0000 (22:45 +0000)]
am
eed8e782: am
dd4dc4a0: resolved conflicts for merge of
7044ee16 to mnc-preview-docs
* commit '
eed8e782ec22a11957c563e79010794571d43be9':
Docs: Final CL for NDK-docs-onto-DAC, pulling all files into a single CL.
David Friedman [Fri, 22 May 2015 22:32:19 +0000 (22:32 +0000)]
am
dd4dc4a0: resolved conflicts for merge of
7044ee16 to mnc-preview-docs
* commit '
dd4dc4a0bec72cbfae8a3b27c72d75e90d38c79b':
Docs: Final CL for NDK-docs-onto-DAC, pulling all files into a single CL.
David Friedman [Fri, 22 May 2015 22:23:12 +0000 (15:23 -0700)]
resolved conflicts for merge of
7044ee16 to mnc-preview-docs
Change-Id: Ia0d831660d7744f34c68dba62e19a11c83ec2ee7
Adrian Roos [Fri, 22 May 2015 22:11:04 +0000 (22:11 +0000)]
am
7dc7e2c5: am
fab33408: Merge "No longer trigger immersive cling on panic" into mnc-dev
* commit '
7dc7e2c59eef0399332911d82472f6a1bb45252f':
No longer trigger immersive cling on panic
Adrian Roos [Fri, 22 May 2015 22:10:58 +0000 (22:10 +0000)]
am
7faee35d: am
d02ec598: Merge "Request transient bars after panic" into mnc-dev
* commit '
7faee35da1f1f08b382b19a560283abd82fc73c3':
Request transient bars after panic
Yin-Chia Yeh [Fri, 22 May 2015 22:10:29 +0000 (22:10 +0000)]
am
d310d94f: am
9fbdc874: Merge "Camera2: update FpsRange requirement" into mnc-dev
* commit '
d310d94f77fcb2da8057cfd948cb2f453a1f2398':
Camera2: update FpsRange requirement
Chih-Hung Hsieh [Fri, 22 May 2015 22:09:45 +0000 (22:09 +0000)]
am
842179f4: am
9e276bc1: Merge "Suppress benign clang warning." into mnc-dev
* commit '
842179f4bf8154240f8529258124bcdcb91b470e':
Suppress benign clang warning.
Chien-Yu Chen [Fri, 22 May 2015 22:09:33 +0000 (22:09 +0000)]
am
7e8e4465: am
9e07ffdb: Merge "ImageReader: Register estimated native allocation" into mnc-dev
* commit '
7e8e446514263f78ae57581b6ca604c18721256c':
ImageReader: Register estimated native allocation
Griff Hazen [Fri, 22 May 2015 22:09:26 +0000 (22:09 +0000)]
am
f8f6bed2: (-s ours) am
ed3236e0: (-s ours) am
d2632a83: (-s ours) am
8f585128: (-s ours) am
d4e00d2b: (-s ours) Merge "Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev
* commit '
f8f6bed200d4ba351bbfd32e8fb9bb18909324be':
Griff Hazen [Fri, 22 May 2015 22:09:21 +0000 (22:09 +0000)]
am
9fb8742e: (-s ours) am
4b591a64: (-s ours) am
cc6029b8: (-s ours) am
dc085ed2: (-s ours) am
5825ad23: (-s ours) Revert "Reduce display device log spam." DO NOT MERGE ANYWHERE
* commit '
9fb8742e743ee3ea1982b3fca2c580f48a2caa55':
Jeff Tinker [Fri, 22 May 2015 22:09:12 +0000 (22:09 +0000)]
am
fee4fa58: am
08cfe2a5: Doc update for MediaDrm\'s OnExpirationUpdate method
* commit '
fee4fa5836289ef395a5cd9b812818307e5711f3':
Doc update for MediaDrm's OnExpirationUpdate method
Selim Cinek [Fri, 22 May 2015 22:09:06 +0000 (22:09 +0000)]
am
f949c8ef: am
3dcd4c89: Merge "Fixed a flash when launching keyguard affordances" into mnc-dev
* commit '
f949c8ef629344452b6d390e4bfa8d7208aa6b50':
Fixed a flash when launching keyguard affordances
Adrian Roos [Fri, 22 May 2015 21:52:29 +0000 (21:52 +0000)]
am
fab33408: Merge "No longer trigger immersive cling on panic" into mnc-dev
* commit '
fab334081eee36d6d75fc19cf686ca9e20246c16':
No longer trigger immersive cling on panic
Adrian Roos [Fri, 22 May 2015 21:52:24 +0000 (21:52 +0000)]
am
d02ec598: Merge "Request transient bars after panic" into mnc-dev
* commit '
d02ec5989dd93df1d6ab45ad9f280730553f11e6':
Request transient bars after panic
Adrian Roos [Fri, 22 May 2015 21:38:22 +0000 (21:38 +0000)]
Merge "No longer trigger immersive cling on panic" into mnc-dev
Adrian Roos [Fri, 22 May 2015 21:37:56 +0000 (21:37 +0000)]
Merge "Request transient bars after panic" into mnc-dev
Yin-Chia Yeh [Fri, 22 May 2015 21:10:54 +0000 (21:10 +0000)]
am
9fbdc874: Merge "Camera2: update FpsRange requirement" into mnc-dev
* commit '
9fbdc87422efe54f075ce8c40d460a3a56449ed6':
Camera2: update FpsRange requirement
Yin-Chia Yeh [Fri, 22 May 2015 20:57:06 +0000 (20:57 +0000)]
Merge "Camera2: update FpsRange requirement" into mnc-dev
Amith Yamasani [Fri, 22 May 2015 20:00:51 +0000 (13:00 -0700)]
Add getPermissionGrantState method in device policy
This is to have a way to query what permission state was set by
the profile owner.
Bug:
21356830
Change-Id: Ie396e946b4285267c1d95f82b9d9765b43697d3c
Chih-Hung Hsieh [Fri, 22 May 2015 20:55:48 +0000 (20:55 +0000)]
am
9e276bc1: Merge "Suppress benign clang warning." into mnc-dev
* commit '
9e276bc1a2c87caeffbcc97f121ad600313f8396':
Suppress benign clang warning.
Yin-Chia Yeh [Thu, 21 May 2015 18:27:06 +0000 (11:27 -0700)]
Camera2: update FpsRange requirement
Codegen doc update only.
Bug:
13639914
Change-Id: Id8a4a237c409725831a65b4f134422cd261cad52
Chih-Hung Hsieh [Fri, 22 May 2015 20:38:24 +0000 (20:38 +0000)]
Merge "Suppress benign clang warning." into mnc-dev
Chien-Yu Chen [Fri, 22 May 2015 20:37:58 +0000 (20:37 +0000)]
am
9e07ffdb: Merge "ImageReader: Register estimated native allocation" into mnc-dev
* commit '
9e07ffdbfbd85ba5431d5145a98df9e688de7b41':
ImageReader: Register estimated native allocation
Griff Hazen [Fri, 22 May 2015 20:37:53 +0000 (20:37 +0000)]
am
ed3236e0: (-s ours) am
d2632a83: (-s ours) am
8f585128: (-s ours) am
d4e00d2b: (-s ours) Merge "Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev
* commit '
ed3236e07176ba02c7549da4794f680fc468455c':
Griff Hazen [Fri, 22 May 2015 20:37:49 +0000 (20:37 +0000)]
am
4b591a64: (-s ours) am
cc6029b8: (-s ours) am
dc085ed2: (-s ours) am
5825ad23: (-s ours) Revert "Reduce display device log spam." DO NOT MERGE ANYWHERE
* commit '
4b591a64d52a1d8444f961d65b034777affbdfcb':
Chien-Yu Chen [Fri, 22 May 2015 20:33:25 +0000 (20:33 +0000)]
Merge "ImageReader: Register estimated native allocation" into mnc-dev
Jeff Tinker [Fri, 22 May 2015 20:23:33 +0000 (20:23 +0000)]
am
08cfe2a5: Doc update for MediaDrm\'s OnExpirationUpdate method
* commit '
08cfe2a5fcb3ec68b14966233511cb7d6d15e543':
Doc update for MediaDrm's OnExpirationUpdate method
Selim Cinek [Fri, 22 May 2015 20:23:29 +0000 (20:23 +0000)]
am
3dcd4c89: Merge "Fixed a flash when launching keyguard affordances" into mnc-dev
* commit '
3dcd4c8948a990dfb98b035198c076b07d115720':
Fixed a flash when launching keyguard affordances
OSDN Git Service
