4986 Commits

Author SHA1 Message Date
Alex Klyubin
e34418471e am 791d76bb: Merge "Switch APK signing from MD5WithRSA to SHA1WithRSA." into jb-mr2-dev
* commit '791d76bb3e0a79106adae02139650ff2b56a31e9':
  Switch APK signing from MD5WithRSA to SHA1WithRSA.
2013-05-20 13:56:44 -07:00
Alex Klyubin
791d76bb3e Merge "Switch APK signing from MD5WithRSA to SHA1WithRSA." into jb-mr2-dev 2013-05-20 20:51:58 +00:00
Alex Klyubin
0aa559b263 Switch APK signing from MD5WithRSA to SHA1WithRSA.
While we're at it, remove duplicates of app-signing.jd.

Bug: 9000563
Change-Id: Ib7e08e719b6b9c9b1e8116e6e2a77611f046b276
2013-05-20 13:47:09 -07:00
Scott Main
f3a5682bba am 412633ba: am 2cca8962: am f657689a: am f943b6de: Merge "update video playlists and marquee announcements" into jb-mr1.1-ub-dev
* commit '412633baa05c7090015c35e0c6645e337cd7cd14':
  update video playlists and marquee announcements
2013-05-20 12:35:57 -07:00
Scott Main
412633baa0 am 2cca8962: am f657689a: am f943b6de: Merge "update video playlists and marquee announcements" into jb-mr1.1-ub-dev
* commit '2cca8962327b2d988bf5172e4142268fa3795b57':
  update video playlists and marquee announcements
2013-05-20 12:33:00 -07:00
Scott Main
2cca896232 am f657689a: am f943b6de: Merge "update video playlists and marquee announcements" into jb-mr1.1-ub-dev
* commit 'f657689ab5b7d46e5f3c9dd376c0cb89479a1075':
  update video playlists and marquee announcements
2013-05-20 12:30:38 -07:00
Scott Main
f943b6def7 Merge "update video playlists and marquee announcements" into jb-mr1.1-ub-dev 2013-05-20 19:26:49 +00:00
Scott Main
9994769f42 update video playlists and marquee announcements
Change-Id: I853a30370bb79d3f392da11e24358c15d42005e5
2013-05-20 12:23:58 -07:00
Scott Main
d2f5f21aea am ecd3f2d7: am eec9bc2f: am ec5c93e0: am df82d256: add info about Windows issue and link to issues page
* commit 'ecd3f2d729188a869c3dfa771ba050e4caaf0dbb':
  add info about Windows issue and link to issues page
2013-05-16 20:45:47 -07:00
Scott Main
ecd3f2d729 am eec9bc2f: am ec5c93e0: am df82d256: add info about Windows issue and link to issues page
* commit 'eec9bc2f567f037225e9bea1d0facebeb98a183d':
  add info about Windows issue and link to issues page
2013-05-16 18:07:22 -07:00
Scott Main
eec9bc2f56 am ec5c93e0: am df82d256: add info about Windows issue and link to issues page
* commit 'ec5c93e0ecd92223a20c049b03f183c588391592':
  add info about Windows issue and link to issues page
2013-05-16 18:05:13 -07:00
Scott Main
df82d25659 add info about Windows issue and link to issues page
Change-Id: I07f1962fd00fc87c783e090f3e6986449f7b6f7c
2013-05-16 18:00:02 -07:00
Scott Main
55e150a513 am 03fe26d5: am d7088026: am 26ab3060: am c452f1e2: add nav drawer icon zip
* commit '03fe26d5b151bc9ad1c6913edb618e666b1c9b89':
  add nav drawer icon zip
2013-05-16 15:14:09 -07:00
Scott Main
03fe26d5b1 am d7088026: am 26ab3060: am c452f1e2: add nav drawer icon zip
* commit 'd708802698baea82136c12e8a4cee805ab0b3efb':
  add nav drawer icon zip
2013-05-16 15:12:11 -07:00
Scott Main
d708802698 am 26ab3060: am c452f1e2: add nav drawer icon zip
* commit '26ab3060ad402204c8a50e184c3947a897667642':
  add nav drawer icon zip
2013-05-16 15:09:40 -07:00
Scott Main
c452f1e251 add nav drawer icon zip
Change-Id: I1eef61cb27ec2b50c88d6d8aa3a34495e2d4c029
2013-05-16 15:02:02 -07:00
Scott Main
f799e1f7fa am 15e102cf: am 6658de78: am 14f1a995: am 67823512: add links to nav drawer icons
* commit '15e102cf3b425484ca4eaf4d8bdab93c30d46f59':
  add links to nav drawer icons
2013-05-16 10:57:20 -07:00
Scott Main
15e102cf3b am 6658de78: am 14f1a995: am 67823512: add links to nav drawer icons
* commit '6658de781b3826513f26383f261ad18d4cd096da':
  add links to nav drawer icons
2013-05-16 10:55:10 -07:00
Scott Main
6658de781b am 14f1a995: am 67823512: add links to nav drawer icons
* commit '14f1a9959311258eea47d1fd1c30b82ceddc9808':
  add links to nav drawer icons
2013-05-16 10:52:04 -07:00
Scott Main
678235122b add links to nav drawer icons
Change-Id: I97cf24421542d70402488f8c193c7bcc7ef7edd5
2013-05-16 10:47:12 -07:00
Dirk Dougherty
8c0eb22d6e am 02ea97b5: am f7089ab0: am d73dee30: am a012887a: Merge "Doc change: change contact form for optimization tips review decisions." into jb-mr1.1-ub-dev
* commit '02ea97b592f453e1faf591acafe374bca74d0de4':
  Doc change: change contact form for optimization tips review decisions.
2013-05-16 08:25:52 -07:00
Dirk Dougherty
02ea97b592 am f7089ab0: am d73dee30: am a012887a: Merge "Doc change: change contact form for optimization tips review decisions." into jb-mr1.1-ub-dev
* commit 'f7089ab0062b3db9858012330501cedcab3739cd':
  Doc change: change contact form for optimization tips review decisions.
2013-05-16 08:24:02 -07:00
Dirk Dougherty
f7089ab006 am d73dee30: am a012887a: Merge "Doc change: change contact form for optimization tips review decisions." into jb-mr1.1-ub-dev
* commit 'd73dee305b7b3b75fe2b6d5d4a99e35d65e06f85':
  Doc change: change contact form for optimization tips review decisions.
2013-05-16 00:35:37 -07:00
Dirk Dougherty
a012887a78 Merge "Doc change: change contact form for optimization tips review decisions." into jb-mr1.1-ub-dev 2013-05-16 07:31:53 +00:00
Dirk Dougherty
83a5f082f0 Doc change: change contact form for optimization tips review decisions.
Change-Id: Ib4d5c5d4a5d078fb7b5612d5908515032e69f565
2013-05-16 00:31:02 -07:00
Scott Main
1a87670938 am 94160cd1: am 93657665: am 65b68f4a: am 0c39152f: add tags to lessons in navigation class
* commit '94160cd1d72ee0d74ddd70298811cbe16e2ef0db':
  add tags to lessons in navigation class
2013-05-15 14:54:11 -07:00
Scott Main
94160cd1d7 am 93657665: am 65b68f4a: am 0c39152f: add tags to lessons in navigation class
* commit '93657665845a61ccf33a81e62a922163234b8cb3':
  add tags to lessons in navigation class
2013-05-15 14:52:39 -07:00
Scott Main
9365766584 am 65b68f4a: am 0c39152f: add tags to lessons in navigation class
* commit '65b68f4a760dc029805aff5f1fa804a3420ac38c':
  add tags to lessons in navigation class
2013-05-15 14:50:03 -07:00
Scott Main
0c39152fc6 add tags to lessons in navigation class
Change-Id: Icab52c7aa3069b4cf700a9f2bc84a6d833b48621
2013-05-15 14:39:20 -07:00
Scott Main
231544c921 am 5f46f16e: am 47dbcfe4: am 023a70da: am c92ce29f: typo
* commit '5f46f16e040163bb5fe9ed841a3d11312d10af01':
  typo
2013-05-15 13:35:03 -07:00
Scott Main
8096329c1f am 5720da0e: am b09a6e9c: am 0a008991: am 98599ee7: final android studio package info
* commit '5720da0e85b05a988c6262e737ba9a8228bd669c':
  final android studio package info
2013-05-15 13:35:01 -07:00
Scott Main
5f46f16e04 am 47dbcfe4: am 023a70da: am c92ce29f: typo
* commit '47dbcfe4ed4922f6b6ece5f46edb13b1fc66f971':
  typo
2013-05-15 10:42:36 -07:00
Scott Main
5720da0e85 am b09a6e9c: am 0a008991: am 98599ee7: final android studio package info
* commit 'b09a6e9cfe847db59a3a16869bfe3b4333bc81df':
  final android studio package info
2013-05-15 10:42:33 -07:00
Scott Main
47dbcfe4ed am 023a70da: am c92ce29f: typo
* commit '023a70daa1c5b2bc0526fc75a7ea92626f476747':
  typo
2013-05-15 10:40:26 -07:00
Scott Main
b09a6e9cfe am 0a008991: am 98599ee7: final android studio package info
* commit '0a0089913292eaa099fcca78efc2c06e76d13f22':
  final android studio package info
2013-05-15 10:40:23 -07:00
Scott Main
c92ce29fe5 typo
Change-Id: I3d8ea3b012d530b4f9212fbac159fce37cf36a03
2013-05-15 09:18:13 -07:00
Scott Main
98599ee71e final android studio package info
Change-Id: I1ec2c09e46c0eb563d6be3eda3fa92e1d692378d
2013-05-15 08:54:28 -07:00
Dirk Dougherty
f4dfad6a89 am 1b173c6d: am 0f5d1391: am b7059861: am 2694897a: am 787cbb37: am 9a51dfd4: Merge "Doc change: add redirects for edu urls." into jb-mr1.1-docs
* commit '1b173c6d5dceac14a42e6bf92980d0e247f5ccbc':
  Doc change: add redirects for edu urls.
2013-05-15 07:39:49 -07:00
Dirk Dougherty
d662bf1a50 am 7b2fba2f: am 997d0042: am aa0acfc8: am 231e2474: Merge commit \'c3069c26\' into manualmerge
* commit '7b2fba2f4a78fb42f42268fb899884b8fe4c5e1d':
  Doc change: updates to location landing.
2013-05-15 07:39:46 -07:00
Dirk Dougherty
1b173c6d5d am 0f5d1391: am b7059861: am 2694897a: am 787cbb37: am 9a51dfd4: Merge "Doc change: add redirects for edu urls." into jb-mr1.1-docs
* commit '0f5d1391f511380382b2cb91cf356d80854230b5':
  Doc change: add redirects for edu urls.
2013-05-15 07:37:59 -07:00
Dirk Dougherty
7b2fba2f4a am 997d0042: am aa0acfc8: am 231e2474: Merge commit \'c3069c26\' into manualmerge
* commit '997d00428c420ba8c2175c7c2e28f14d54abd0b9':
  Doc change: updates to location landing.
2013-05-15 07:37:55 -07:00
Dirk Dougherty
0f5d1391f5 am b7059861: am 2694897a: am 787cbb37: am 9a51dfd4: Merge "Doc change: add redirects for edu urls." into jb-mr1.1-docs
* commit 'b705986179b1bbda80c9281477a4d6b6b6d27e88':
  Doc change: add redirects for edu urls.
2013-05-15 07:35:52 -07:00
Dirk Dougherty
997d00428c am aa0acfc8: am 231e2474: Merge commit \'c3069c26\' into manualmerge
* commit 'aa0acfc8761fc8802879f90511b904061a523ed2':
  Doc change: updates to location landing.
2013-05-15 07:35:49 -07:00
Dirk Dougherty
2694897a3c am 787cbb37: am 9a51dfd4: Merge "Doc change: add redirects for edu urls." into jb-mr1.1-docs
* commit '787cbb37d5cb2334af80d8da1b8fa4286e845eee':
  Doc change: add redirects for edu urls.
2013-05-15 07:32:03 -07:00
Dirk Dougherty
231e2474f2 Merge commit 'c3069c26' into manualmerge
Conflicts:
	docs/html/guide/topics/location/strategies.jd

Change-Id: If38621ee5e6266fb3a68aff710553dc68d07eb5b
2013-05-15 07:30:11 -07:00
Dirk Dougherty
9a51dfd4e3 Merge "Doc change: add redirects for edu urls." into jb-mr1.1-docs 2013-05-15 13:34:31 +00:00
Dirk Dougherty
8d59513030 Merge "Doc change: updates to location landing." into jb-mr1.1-docs 2013-05-15 13:33:06 +00:00
Dirk Dougherty
d14295cf0e Doc change: updates to location landing.
Change-Id: Id7862fd966d9e80bf23521620e964813ad9065a6
2013-05-15 06:31:48 -07:00
Dirk Dougherty
89d42cabcd am 0163a180: am 8f13a2ad: am c3727b78: am 260f110f: am 7929aafe: am 6402d93e: Doc change: add files for edu content.
* commit '0163a180510128142ed9f13bf0d5a7daa4bf6c30':
  Doc change: add files for edu content.
2013-05-15 05:37:14 -07:00
Dirk Dougherty
0163a18051 am 8f13a2ad: am c3727b78: am 260f110f: am 7929aafe: am 6402d93e: Doc change: add files for edu content.
* commit '8f13a2ad9f68ddb10388e86104868311e5ee2e29':
  Doc change: add files for edu content.
2013-05-15 05:35:25 -07:00