drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
92,257 Commits 1 Branch 0 Tags
Commit Graph

92257 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
45e87f4ebe am 0775c1ba: am b3d79b44: am 4a3c5584: Merge "Doc change: fix tiny url." into jb-mr1.1-docs 
* commit '0775c1ba90633c9d00116299a57ecd84142e67c8':
  Doc change: fix tiny url.
 2013-05-20 18:12:29 -07:00
Dirk Dougherty
0775c1ba90 am b3d79b44: am 4a3c5584: Merge "Doc change: fix tiny url." into jb-mr1.1-docs 
* commit 'b3d79b44ebb32bc3f9505a895728ad0a8a16ed2f':
  Doc change: fix tiny url.
 2013-05-20 18:11:22 -07:00
Dirk Dougherty
b3d79b44eb am 4a3c5584: Merge "Doc change: fix tiny url." into jb-mr1.1-docs 
* commit '4a3c55846ad488e68236837504ffd953498eb9fb':
  Doc change: fix tiny url.
 2013-05-20 18:09:46 -07:00
Dirk Dougherty
4a3c55846a Merge "Doc change: fix tiny url." into jb-mr1.1-docs 2013-05-21 01:07:33 +00:00
Scott Main
6f190a71c5 am 0d3f6eda: add redirects for devsite, as per I2f3c62a7a18f370c376e1edf6dc9c43983bc6edb 
* commit '0d3f6eda6ce63592da4d11841a195948d8d0b5d3':
  add redirects for devsite, as per I2f3c62a7a18f370c376e1edf6dc9c43983bc6edb
 2013-05-20 14:58:58 -07:00
Scott Main
0d3f6eda6c add redirects for devsite, as per I2f3c62a7a18f370c376e1edf6dc9c43983bc6edb 
Change-Id: Iea8a519c8d1888b89f4849e9290fa191f495581d
 2013-05-20 14:56:44 -07:00
Scott Main
b7d1f69a7e am 84668136: Merge "delete obsolete duplicate files" into jb-mr1.1-ub-dev 
* commit '8466813637cf2b1f5f12f8524237aed6c95ad4e9':
  delete obsolete duplicate files
 2013-05-20 14:47:34 -07:00
Scott Main
efb6884c36 am 3ff66535: add notice about corrupt DMG message bug: 8859130 
* commit '3ff6653525fbda7e1bf5e06f59b5474e390f6de1':
  add notice about corrupt DMG message bug: 8859130
 2013-05-20 14:44:16 -07:00
Scott Main
8466813637 Merge "delete obsolete duplicate files" into jb-mr1.1-ub-dev 2013-05-20 21:43:33 +00:00
Scott Main
3ff6653525 add notice about corrupt DMG message 
bug: 8859130

Change-Id: I6fffcbdd7d57235cb1fdc9861b569f6feedba6c5
 2013-05-20 14:35:30 -07:00
Scott Main
3661ee568f delete obsolete duplicate files 
Change-Id: I715362c1dc7022581faf8653ec49da49b3c6ed4a
 2013-05-20 14:23:44 -07:00
Alex Klyubin
bce05d9125 am 45e56fd5: cherypick from mr2: Ib7e08e719b6b9c9b1e8116e6e2a77611f046b276 Switch APK signing from MD5WithRSA to SHA1WithRSA. 
* commit '45e56fd5e1d3747cc1a9f1ecd5883ee491bff532':
  cherypick from mr2: Ib7e08e719b6b9c9b1e8116e6e2a77611f046b276 Switch APK signing from MD5WithRSA to SHA1WithRSA.
 2013-05-20 14:10:39 -07:00
Alex Klyubin
45e56fd5e1 cherypick from mr2: Ib7e08e719b6b9c9b1e8116e6e2a77611f046b276 
Switch APK signing from MD5WithRSA to SHA1WithRSA.

While we're at it, remove duplicates of app-signing.jd.

Change-Id: I3b5441bc61107a4f6d9b67366517785e6792cf9e
 2013-05-20 14:05:56 -07:00
Dirk Dougherty
3066b1fe6c Doc change: fix tiny url. 
Change-Id: Iea59aadd7b83e8f076e65b75fbb4bd9109e26307
 2013-05-20 13:45:04 -07:00
Scott Main
f657689ab5 am f943b6de: Merge "update video playlists and marquee announcements" into jb-mr1.1-ub-dev 
* commit 'f943b6def746217db06fc7c33e4d181fc55b87be':
  update video playlists and marquee announcements
 2013-05-20 12:28:54 -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
ec5c93e0ec am df82d256: add info about Windows issue and link to issues page 
* commit 'df82d256592d6743e400ccf1c82822ddb56fefbe':
  add info about Windows issue and link to issues page
 2013-05-16 18:03:12 -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
26ab3060ad am c452f1e2: add nav drawer icon zip 
* commit 'c452f1e251ca7aa26a2cfbb04e2f1086f18ca5df':
  add nav drawer icon zip
 2013-05-16 15:07:46 -07:00
Scott Main
c452f1e251 add nav drawer icon zip 
Change-Id: I1eef61cb27ec2b50c88d6d8aa3a34495e2d4c029
 2013-05-16 15:02:02 -07:00
Scott Main
14f1a99593 am 67823512: add links to nav drawer icons 
* commit '678235122bb61304a36731e7a4ab1f4ad666980f':
  add links to nav drawer icons
 2013-05-16 10:50:13 -07:00
Scott Main
678235122b add links to nav drawer icons 
Change-Id: I97cf24421542d70402488f8c193c7bcc7ef7edd5
 2013-05-16 10:47:12 -07:00
Dirk Dougherty
d73dee305b am a012887a: Merge "Doc change: change contact form for optimization tips review decisions." into jb-mr1.1-ub-dev 
* commit 'a012887a7856c29e77cd9b08fab16a6c26c93c57':
  Doc change: change contact form for optimization tips review decisions.
 2013-05-16 00:33:29 -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
65b68f4a76 am 0c39152f: add tags to lessons in navigation class 
* commit '0c39152fc6847c8332aed46fd944579806d583df':
  add tags to lessons in navigation class
 2013-05-15 14:47:44 -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
023a70daa1 am c92ce29f: typo 
* commit 'c92ce29fe59d0ac0693847a6ac68bdadc507f1e7':
  typo
 2013-05-15 10:38:50 -07:00
Scott Main
0a00899132 am 98599ee7: final android studio package info 
* commit '98599ee71eb1af403cd2f122dafc53c7aa380335':
  final android studio package info
 2013-05-15 10:38:47 -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
b705986179 am 2694897a: am 787cbb37: am 9a51dfd4: Merge "Doc change: add redirects for edu urls." into jb-mr1.1-docs 
* commit '2694897a3c20b79e3b28601ee43bcaefec827232':
  Doc change: add redirects for edu urls.
 2013-05-15 07:33:18 -07:00
Dirk Dougherty
aa0acfc876 am 231e2474: Merge commit \'c3069c26\' into manualmerge 
* commit '231e2474f283dc0a1962b45f1c16c5280a8937df':
  Doc change: updates to location landing.
 2013-05-15 07:33:16 -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
787cbb37d5 am 9a51dfd4: Merge "Doc change: add redirects for edu urls." into jb-mr1.1-docs 
* commit '9a51dfd4e3e10411ede67743f85cdd510ba3eb90':
  Doc change: add redirects for edu urls.
 2013-05-15 06:38:32 -07:00
Dirk Dougherty
c3069c2614 am 8d595130: Merge "Doc change: updates to location landing." into jb-mr1.1-docs 
* commit '8d59513030cbc61c37aec2d2a2343a9bfc03ae2d':
  Doc change: updates to location landing.
 2013-05-15 06:35:10 -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
c3727b78fa am 260f110f: am 7929aafe: am 6402d93e: Doc change: add files for edu content. 
* commit '260f110fce5374fa2c4b2d1788a54b1fa5a04d0f':
  Doc change: add files for edu content.
 2013-05-15 04:33:00 -07:00
Dirk Dougherty
260f110fce am 7929aafe: am 6402d93e: Doc change: add files for edu content. 
* commit '7929aafeaf95b1531e471cfbe9b79acd6a783a23':
  Doc change: add files for edu content.
 2013-05-15 04:29:16 -07:00
Dirk Dougherty
206a40720a Doc change: add redirects for edu urls. 
Change-Id: Ic46047c99fe9b1902694d9ecdcea1c9c799ee611
 2013-05-15 04:28:25 -07:00
Dirk Dougherty
7929aafeaf am 6402d93e: Doc change: add files for edu content. 
* commit '6402d93ed8ff6712c0b9787188607e5a9b212602':
  Doc change: add files for edu content.
 2013-05-15 04:24:49 -07:00
Dirk Dougherty
6402d93ed8 Doc change: add files for edu content. 
Change-Id: I5187958d5bbbdd1117df5bcc9b553c06323fef8d
 2013-05-15 04:17:19 -07:00
Dirk Dougherty
63c15be8a9 am f76a9d23: am 7ea00d91: am a38ca33d: Doc change: update gms and gcm reference TOC. 
* commit 'f76a9d23db204734ac88a20a96fd87c0d4b63665':
  Doc change: update gms and gcm reference TOC.
 2013-05-15 02:51:01 -07:00
Dirk Dougherty
f76a9d23db am 7ea00d91: am a38ca33d: Doc change: update gms and gcm reference TOC. 
* commit '7ea00d91c1f3447168cafebe04a99462e5c25c32':
  Doc change: update gms and gcm reference TOC.
 2013-05-15 02:49:13 -07:00
Dirk Dougherty
7ea00d91c1 am a38ca33d: Doc change: update gms and gcm reference TOC. 
* commit 'a38ca33d17f40a0a67855b2ec1b5895a5157b851':
  Doc change: update gms and gcm reference TOC.
 2013-05-15 02:47:04 -07:00
Dirk Dougherty
a38ca33d17 Doc change: update gms and gcm reference TOC. 
Change-Id: I24b9506c3111a744c26e0c6c2b94192402684c80
 2013-05-15 02:40:55 -07:00