195823 Commits

Author SHA1 Message Date
Geoff Mendal
e1e5899da9 Import translations. DO NOT MERGE
Change-Id: If4c6dce6576f4f3266eea0d4be2e04f05e1f534e
Auto-generated-cl: translation import
2015-05-25 08:49:44 -05:00
Dirk Dougherty
79d416fd24 am a74b88ff: am d8bd7dd9: am 26aba8de: am 82159cd5: am 10d44b75: Doc change: Updates to preview and distribute.
* commit 'a74b88ff21cac36165fb4046ede40436be62ae13':
  Doc change: Updates to preview and distribute.
2015-05-24 15:07:30 +00:00
Dirk Dougherty
a74b88ff21 am d8bd7dd9: am 26aba8de: am 82159cd5: am 10d44b75: Doc change: Updates to preview and distribute.
* commit 'd8bd7dd97fec6dcc82a8376cf5cb060e80143ddb':
  Doc change: Updates to preview and distribute.
2015-05-24 14:47:36 +00:00
Dirk Dougherty
d8bd7dd97f am 26aba8de: am 82159cd5: am 10d44b75: Doc change: Updates to preview and distribute.
* commit '26aba8dee401f20983d1499feb055008489f0f1a':
  Doc change: Updates to preview and distribute.
2015-05-24 14:20:16 +00:00
Dirk Dougherty
26aba8dee4 am 82159cd5: am 10d44b75: Doc change: Updates to preview and distribute.
* commit '82159cd537c706f3dd7e33d0683705ebccffc370':
  Doc change: Updates to preview and distribute.
2015-05-24 13:57:08 +00:00
Dirk Dougherty
82159cd537 am 10d44b75: Doc change: Updates to preview and distribute.
* commit '10d44b7581b67d6619c7060ca1d339e0d355c7af':
  Doc change: Updates to preview and distribute.
2015-05-24 12:31:01 +00:00
Dirk Dougherty
10d44b7581 Doc change: Updates to preview and distribute.
Change-Id: I097213ce68d50d10b23840f2ad61f26279293948
2015-05-23 21:17:39 -07:00
Svet Ganov
30bc4f9203 am 0f292360: am 43e181d0: am a7590243: Merge "Hide pakcage installer system APIs." into mnc-dev
* commit '0f292360f87736c2d79671a915f8fa6ef993afbd':
  Hide pakcage installer system APIs.
2015-05-23 21:07:21 +00:00
Svet Ganov
0f292360f8 am 43e181d0: am a7590243: Merge "Hide pakcage installer system APIs." into mnc-dev
* commit '43e181d0fb9fb91db20fdb54a33ad9b33d7f19c9':
  Hide pakcage installer system APIs.
2015-05-23 20:55:51 +00:00
Svet Ganov
43e181d0fb am a7590243: Merge "Hide pakcage installer system APIs." into mnc-dev
* commit 'a75902439403966b9308d38fcf5e51c20e43a583':
  Hide pakcage installer system APIs.
2015-05-23 20:44:33 +00:00
Svet Ganov
a759024394 Merge "Hide pakcage installer system APIs." into mnc-dev 2015-05-23 20:31:55 +00:00
Svet Ganov
0b316706b1 Hide pakcage installer system APIs.
Change-Id: If5245ed2be7a3ebb50a7af924be85894314f6f47
2015-05-23 13:25:11 -07:00
Joe Fernandez
dcec585adc am c4d181f5: am eef2f6f4: am 75a3f34e: am 3b521a6a: am 38097510: docs: M Preview - Automatic Backups (Dolly) page
* commit 'c4d181f552f7ad12e76667099f76a6156f3d3583':
  docs: M Preview - Automatic Backups (Dolly) page
2015-05-23 10:57:03 +00:00
Joe Fernandez
c4d181f552 am eef2f6f4: am 75a3f34e: am 3b521a6a: am 38097510: docs: M Preview - Automatic Backups (Dolly) page
* commit 'eef2f6f4103ac1a3f385708bd45930d0306f6f46':
  docs: M Preview - Automatic Backups (Dolly) page
2015-05-23 10:44:57 +00:00
Joe Fernandez
eef2f6f410 am 75a3f34e: am 3b521a6a: am 38097510: docs: M Preview - Automatic Backups (Dolly) page
* commit '75a3f34e7616167dfc0979470523ed3c333dd85a':
  docs: M Preview - Automatic Backups (Dolly) page
2015-05-23 10:33:46 +00:00
Joe Fernandez
75a3f34e76 am 3b521a6a: am 38097510: docs: M Preview - Automatic Backups (Dolly) page
* commit '3b521a6ad53710171efee6c2ea72b4c3c5f37101':
  docs: M Preview - Automatic Backups (Dolly) page
2015-05-23 10:22:21 +00:00
Joe Fernandez
bc016cadeb am 9b2350fc: am 9f61dc8b: am d7c91c0d: am 08162fec: am 84fff53c: Merge "docs: M Preview - update the preview section TOC" into mnc-preview-docs
* commit '9b2350fc57bf13be6efebb788b7d49a17072a234':
  docs: M Preview - update the preview section TOC
2015-05-23 10:17:01 +00:00
Joe Fernandez
3b521a6ad5 am 38097510: docs: M Preview - Automatic Backups (Dolly) page
* commit '380975104a9246c4f72f7882d855aec524267b6f':
  docs: M Preview - Automatic Backups (Dolly) page
2015-05-23 10:08:49 +00:00
Joe Fernandez
9b2350fc57 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
2015-05-23 10:03:12 +00:00
Joe Fernandez
380975104a docs: M Preview - Automatic Backups (Dolly) page
Change-Id: Ia9e6815271f5f22d6f11f1d61e68b6670f51a53d
2015-05-23 02:56:29 -07:00
Joe Fernandez
9f61dc8b8a 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
2015-05-23 09:51:33 +00:00
Joe Fernandez
d7c91c0d07 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
2015-05-23 09:39:38 +00:00
Joe Fernandez
08162fec0c 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
2015-05-23 08:03:24 +00:00
Joe Fernandez
84fff53cd7 Merge "docs: M Preview - update the preview section TOC" into mnc-preview-docs 2015-05-23 07:50:50 +00:00
Joe Fernandez
184aaa7d3a docs: M Preview - update the preview section TOC
Change-Id: I5776d367df3baec13aee27a8e920de9d9b69782d
2015-05-23 00:50:12 -07:00
Johan Euphrosine
3c8714f5b8 am fe43cfa3: am c8aaab82: am 5940f4bd: am 33a4f81e: am 6a7406bc: frameworks/base/docs/ndk: fix typo in landing page
* commit 'fe43cfa328aec9ce230856316acf7f841a5f5a24':
  frameworks/base/docs/ndk: fix typo in landing page
2015-05-23 05:21:31 +00:00
Johan Euphrosine
fe43cfa328 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
2015-05-23 05:08:35 +00:00
Johan Euphrosine
c8aaab82a4 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
2015-05-23 04:56:55 +00:00
Johan Euphrosine
5940f4bd99 am 33a4f81e: am 6a7406bc: frameworks/base/docs/ndk: fix typo in landing page
* commit '33a4f81edbb0047aef34126e6d584b168d992862':
  frameworks/base/docs/ndk: fix typo in landing page
2015-05-23 04:45:32 +00:00
Johan Euphrosine
33a4f81edb am 6a7406bc: frameworks/base/docs/ndk: fix typo in landing page
* commit '6a7406bc1787d0b555ca3a3226a291d42554a94c':
  frameworks/base/docs/ndk: fix typo in landing page
2015-05-23 04:33:18 +00:00
Joe Fernandez
c99eaed012 am 1ee00fd5: am 5365ad4a: am 801ca67c: am 528cf52e: am 6cf938c3: Merge "docs: Add sample links and descriptions for M Preview" into mnc-preview-docs
* commit '1ee00fd578b7d3a01c6d3d81dc784a7001e43066':
  docs: Add sample links and descriptions for M Preview
2015-05-23 01:56:46 +00:00
Deepanshu Gupta
c49e8d4ae7 am 54e14aae: am f2ec459d: am d0acf062: Merge "Revert "Fix build."" into mnc-dev
* commit '54e14aae126b30e381599d740f78d523cf1ce8e6':
  Revert "Fix build."
2015-05-23 01:56:41 +00:00
Jean-Michel Trivi
f6f7078dbc am de93e962: am 2d72ded2: am ed77bc09: Merge "More android.media.AudioFormat javadoc" into mnc-dev
* commit 'de93e962ea73424d77c83927d96e0c3fadb00b91':
  More android.media.AudioFormat javadoc
2015-05-23 01:56:36 +00:00
Joe Fernandez
1ee00fd578 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
2015-05-23 01:41:20 +00:00
Deepanshu Gupta
54e14aae12 am f2ec459d: am d0acf062: Merge "Revert "Fix build."" into mnc-dev
* commit 'f2ec459d853cb1a47138d00c7123dd1b83363462':
  Revert "Fix build."
2015-05-23 01:41:15 +00:00
Jean-Michel Trivi
de93e962ea am 2d72ded2: am ed77bc09: Merge "More android.media.AudioFormat javadoc" into mnc-dev
* commit '2d72ded27cd4ce78a42bb4c0d73cb2fc3c3cf3e3':
  More android.media.AudioFormat javadoc
2015-05-23 01:41:10 +00:00
Joe Fernandez
5365ad4a15 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
2015-05-23 01:29:36 +00:00
Deepanshu Gupta
f2ec459d85 am d0acf062: Merge "Revert "Fix build."" into mnc-dev
* commit 'd0acf0627aa5f78cbf5bb189c7097546b86abebc':
  Revert "Fix build."
2015-05-23 01:29:31 +00:00
Jean-Michel Trivi
2d72ded27c am ed77bc09: Merge "More android.media.AudioFormat javadoc" into mnc-dev
* commit 'ed77bc09879784a56c60f215f267adc100213ed2':
  More android.media.AudioFormat javadoc
2015-05-23 01:29:26 +00:00
Joe Fernandez
801ca67cb6 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
2015-05-23 01:22:10 +00:00
Deepanshu Gupta
d0acf0627a Merge "Revert "Fix build."" into mnc-dev 2015-05-23 01:21:11 +00:00
Deepanshu Gupta
944a6c937c Revert "Fix build."
This reverts commit 97b3ae1a8766616675ebf2323a97d8adfd41bfdc.

Reverted since 4bb6b751fbbb218e8a298db4aa008472a0aa8d31 reverts
the commit that warranted this change.

Change-Id: I56d0eb8ffba44a673ae357e9543dd18f6c03c54f
2015-05-23 01:20:53 +00:00
Jean-Michel Trivi
ed77bc0987 Merge "More android.media.AudioFormat javadoc" into mnc-dev 2015-05-23 01:19:03 +00:00
Jean-Michel Trivi
4ed06d2e30 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
2015-05-22 18:10:06 -07:00
Dianne Hackborn
08e14da78d am a597200a: am 54d803c0: am dd5ee4b8: Merge "Revert "resolved conflicts for merge of 47249f2a to mnc-dev"" into mnc-dev
* commit 'a597200a60a8b2ab63498700a0b7b0a9ea948c93':
  Revert "resolved conflicts for merge of 47249f2a to mnc-dev"
2015-05-23 01:09:15 +00:00
Joe Fernandez
528cf52e76 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
2015-05-23 01:09:02 +00:00
Johan Euphrosine
6a7406bc17 frameworks/base/docs/ndk: fix typo in landing page
Change-Id: Ie792506b73e85dd58ebf481339801aa1d8036031
2015-05-22 18:01:57 -07:00
Dianne Hackborn
a597200a60 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"
2015-05-23 00:58:27 +00:00
Simranjit Singh Kohli
94083dacd9 am be134e31: am c2e945ba: am aefdaa5c: Merge "[ChooseAccount/AccountManager.newChooseAccountIntent Bug Fixes]" into mnc-dev
* commit 'be134e31008bb8017f683f553cefeef16fab86dd':
  [ChooseAccount/AccountManager.newChooseAccountIntent Bug Fixes]
2015-05-23 00:57:51 +00:00
Dirk Dougherty
e00399bf53 am cf498094: am e54887a0: am 8f51279d: am c56a8313: am b1410bc3: Merge "Doc change: updates for preview." into mnc-preview-docs
* commit 'cf4980940661c21c0bf0e4b5214935d1b5fedbd6':
  Doc change: updates for preview.
2015-05-23 00:57:47 +00:00