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

4679 Commits

Author SHA1 Message Date
Scott Main
86c25decc0 add search tag for swipe view lesson 
Change-Id: I4e880dbe6d77c89eff7e9b56c4ec98d8b7df906d
 2013-05-20 20:54:31 -07:00
Scott Main
e205386e1e am 66e965dd: am 2377da02: Merge "delete orphaned and obsolete files" into jb-mr1.1-ub-dev 
* commit '66e965dd0fec17a87781821f7a360964a075f18f':
  delete orphaned and obsolete files
 2013-05-20 18:53:18 -07:00
Scott Main
2377da025a Merge "delete orphaned and obsolete files" into jb-mr1.1-ub-dev 2013-05-21 01:46:18 +00:00
Dirk Dougherty
807582cbb9 am 45e87f4e: am 0775c1ba: am b3d79b44: am 4a3c5584: Merge "Doc change: fix tiny url." into jb-mr1.1-docs 
* commit '45e87f4ebe9ddde27dd5e0e28267c433c30b476b':
  Doc change: fix tiny url.
 2013-05-20 18:15:43 -07:00
Scott Main
7bfd39a47d delete orphaned and obsolete files 
Change-Id: I2e199ce5ff5c4e4c9622897eed0072c3aba02bc4
 2013-05-20 18:14:42 -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
4a3c55846a Merge "Doc change: fix tiny url." into jb-mr1.1-docs 2013-05-21 01:07:33 +00:00
Scott Main
f71e41e81c am 6f190a71: am 0d3f6eda: add redirects for devsite, as per I2f3c62a7a18f370c376e1edf6dc9c43983bc6edb 
* commit '6f190a71c5344f35bc05b80a7630cd8415b9dada':
  add redirects for devsite, as per I2f3c62a7a18f370c376e1edf6dc9c43983bc6edb
 2013-05-20 15:04:03 -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
31dfb4c12c am b7d1f69a: am 84668136: Merge "delete obsolete duplicate files" into jb-mr1.1-ub-dev 
* commit 'b7d1f69a7e4710b13308afc9018adb1ecd9e47c2':
  delete obsolete duplicate files
 2013-05-20 14:50:51 -07:00
Scott Main
30cb123488 am efb6884c: am 3ff66535: add notice about corrupt DMG message bug: 8859130 
* commit 'efb6884c3640b4c5f1307b8d109cc740597c6cfb':
  add notice about corrupt DMG message bug: 8859130
 2013-05-20 14:47:27 -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
8cd5592c5f am bce05d91: am 45e56fd5: cherypick from mr2: Ib7e08e719b6b9c9b1e8116e6e2a77611f046b276 Switch APK signing from MD5WithRSA to SHA1WithRSA. 
* commit 'bce05d9125d7c9bf536bc6cb1758c7cd3e485166':
  cherypick from mr2: Ib7e08e719b6b9c9b1e8116e6e2a77611f046b276 Switch APK signing from MD5WithRSA to SHA1WithRSA.
 2013-05-20 14:13:19 -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
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
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
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
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
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
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
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
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
8f13a2ad9f am c3727b78: am 260f110f: am 7929aafe: am 6402d93e: Doc change: add files for edu content. 
* commit 'c3727b78faf23f84a4888d96a0e21716ac0cecb7':
  Doc change: add files for edu content.
 2013-05-15 05:28:14 -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
6402d93ed8 Doc change: add files for edu content. 
Change-Id: I5187958d5bbbdd1117df5bcc9b553c06323fef8d
 2013-05-15 04:17:19 -07:00
Dirk Dougherty
6999e89fd3 am 63c15be8: am f76a9d23: am 7ea00d91: am a38ca33d: Doc change: update gms and gcm reference TOC. 
* commit '63c15be8a9b12bbc487e48160623a5aae883255b':
  Doc change: update gms and gcm reference TOC.
 2013-05-15 02:52:39 -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
Scott Main
78d38908c4 am f2216fd0: am 527b7623: more search suggest tagging 
* commit 'f2216fd0af83ba648f2ea0662d25210137bf0da3':
  more search suggest tagging
 2013-05-15 02:41:07 -07:00
Dirk Dougherty
a38ca33d17 Doc change: update gms and gcm reference TOC. 
Change-Id: I24b9506c3111a744c26e0c6c2b94192402684c80
 2013-05-15 02:40:55 -07:00