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

35 Commits

Author SHA1 Message Date
David Friedman
704ebab343 resolved conflicts for merge of 6248cdd5 to master 
Change-Id: I4f7f69c28c90ff4fb8e2db9468d8024162f62c7b
 2015-02-23 14:40:48 -08:00
David Friedman
7cdd6671f8 Fixes several typos. 
Change-Id: Iea6463bb4f0e8c178d77a0e19544e7b2cbf8c3ca
 2015-02-20 09:40:06 -08:00
Rich Slogar
64d090d85a am 93cd3929: am c905da57: am 5af2270b: am cd9c0cab: am 708959b5: am 755c5d88: am 56375d90: docs: lint inspection updates 
* commit '93cd3929ae757e499c13a03f575c4bd0721ac4b6':
  docs: lint inspection updates
 2015-02-18 23:50:14 +00:00
Rich Slogar
56375d9066 docs: lint inspection updates 
Change-Id: I870533a8b22b54b848b9245387ca40d79e49295f
 2015-02-18 14:17:21 -08:00
Chris Banes
6026f73406 resolved conflicts for merge of 1c131eeb to master 
Change-Id: I886d726322514fa3b27cdc80b8dd57faa94bade5
 2015-02-18 11:02:49 +00:00
Rich Slogar
7a217113d8 am 65d12bf7: am c7067053: am 2b29d96f: am 82510fa5: am 9c9a3afb: am 8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docs automerge: fa40f00 
* commit '65d12bf7f14ff7568cc3011793e219391f9c3d29':
  docs: studio proxy setting setup
  docs: studio proxy setup
 2015-02-18 00:30:08 +00:00
Rich Slogar
3c3b780cae Merge "docs: studio mipmap update" into lmp-docs 2015-02-17 22:06:46 +00:00
Rich Slogar
38f2242e39 docs: studio mipmap update 
Change-Id: Id493c079186585a29a8c6b1ba57d921a7327868d
 2015-02-13 17:17:41 -08:00
Rich Slogar
0726a31f2b docs: studio proxy setting setup 
b/18332702

Change-Id: If3a78fc7b906bb94cfa74fc07b95ef72a84cf825
 2015-02-13 16:44:32 -08:00
Rich Slogar
21d940c3cf resolved conflicts for merge of 20e7ab86 to master 
Change-Id: I346419455a1a97c3eddb639188bcd81593887e97
 2015-01-16 11:56:55 -08:00
Rich Slogar
48fc1d7ba7 Merge "docs: studio sample procedure update" into lmp-docs 2015-01-16 00:26:39 +00:00
Joe Fernandez
de60e6d00a am 912b2574: am 52aec00c: am ca14e6c8: am f50be1fc: am 91c35ce1: Merge "docs: studio index typo" into lmp-docs 
automerge: 87df2ea

* commit '87df2ea08fbb9360910c006ca920c43e5165b604':
  docs: studio index typo
 2015-01-07 10:22:55 +00:00
Rich Slogar
ee371073f1 docs: studio index typo 
Change-Id: I185e59cdba604ee894bc08f55ebb042281d44cd2
 2015-01-05 14:47:19 -08:00
Rich Slogar
7cc83988d3 docs: studio sample procedure update 
b/18591448

Change-Id: Ie69d3391bd45ec3b4c2bccc8eb86e5f28290f686
 2014-12-19 10:40:55 -08:00
Joe Fernandez
7e5e1ccdad am e33b63fe: am 9a05dee5: am e70cb874: am c59d1d78: Merge "docs: studio basics typo" into lmp-docs automerge: 72268ad 
automerge: d6bba15

* commit 'd6bba15c032270f9545b20cbf6fa8792559ce1fb':
  docs: studio basics typo
 2014-12-16 02:37:07 +00:00
Joe Fernandez
c59d1d780b Merge "docs: studio basics typo" into lmp-docs 2014-12-13 00:03:10 +00:00
Rich Slogar
7789f4dbee docs: studio basics typo 
Change-Id: I3e20deb2abc8513266cc2182d9be1ae809bbeae0
 2014-12-12 15:56:46 -08:00
Joe Fernandez
80cfbedbfd am 6ea9db4b: am 81779694: am c9014b6d: am ea500a3a: am 0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs automerge: a878256 
* commit '6ea9db4b6434b9f2c1059e7c4a050ea4245a7342':
  docs: studio basics haxm updates
 2014-12-12 04:25:59 +00:00
Joe Fernandez
0aa2344577 Merge "docs: studio basics haxm updates" into lmp-docs 2014-12-11 19:43:18 +00:00
Rich Slogar
d282ba778b docs: studio basics haxm updates 
Change-Id: I2c3ef0dae3a091be27f1cfef13fe385f97781492
 2014-12-11 10:03:19 -08:00
Joe Fernandez
4c7ec3d469 am e4e1687d: am 5a64a475: am 9727d191: am 534ae165: am 3454091d: Merge "docs:studio basic links" into lmp-docs automerge: 4ded0a1 
* commit 'e4e1687d73870a3ea05a26fb3a3ec598b42f053d':
  docs:studio basic links
 2014-12-10 22:00:11 +00:00
smain@google.com
2c3c4b168b am 835ad716: am 5a267e72: am 5b16e21b: am 6554bb45: am 1a2308bb: Merge "misc updates related to Android Studio. clarify a few doc titles for improved search results clarity. update "get started" page link to Android Studio, add First App link, and remove some biased l 
* commit '835ad71635638f1154a887464758fe81457da327':
  misc updates related to Android Studio. clarify a few doc titles for improved search results clarity. update "get started" page link to Android Studio, add First App link, and remove some biased language.
 2014-12-10 21:58:06 +00:00
Joe Fernandez
3454091dad Merge "docs:studio basic links" into lmp-docs 2014-12-10 19:23:16 +00:00
Rich Slogar
8866975b53 docs:studio basic links 
Change-Id: Ib097530baa3035bc83eeb49a3e14eadbac58aca1
 2014-12-10 10:18:09 -08:00
smain@google.com
848b1c2201 am b1d41255: am 92b6011d: am 9ecc18e2: am 4267450e: am 780a2231: am 2023bec7: revise ADT migration message b/18668828 and fix broken link 
* commit 'b1d41255540256136b058726e0e3efb0439e713f':
  revise ADT migration message b/18668828 and fix broken link
 2014-12-10 17:42:54 +00:00
smain@google.com
cf18fa6cd8 misc updates related to Android Studio. 
clarify a few doc titles for improved search results clarity.
update "get started" page link to Android Studio, add First App link,
and remove some biased language.

Change-Id: I5e4faef8a6eb0a08eec45981a4f9436cb07a995c
 2014-12-09 17:26:07 -08:00
Dmitriy Ivanov
33f6c9f45d resolved conflicts for merge of bd5098e6 to master 
Change-Id: I5959958476c3edc16f9a13a06517f70be7ec32e3
 2014-12-09 17:22:31 -08:00
smain@google.com
b56db728fa resolved conflicts for merge of c137d08c to master 
Change-Id: I1addaa7b46e893014eca23746c6bf5f7e71dc2ca
 2014-12-09 14:19:57 -08:00
Joe Fernandez
ead7b78b9e resolved conflicts for merge of 66189de6 to master 
Change-Id: Id4a80013dd506bd1135dd931450ee2a08a4c77aa
 2014-12-09 13:58:23 -08:00
smain@google.com
2023bec7bf revise ADT migration message 
b/18668828
and fix broken link

Change-Id: I64cba60ebdd0649a0394e0f4284160514f56099e
 2014-12-08 19:37:17 -08:00
smain@google.com
6ae492e672 changes to deprecate eclipse docs and update migration guide 
Change-Id: Icb3c0d93a968d5b1db829ff1db51ecdc47374803
 2014-12-08 11:55:12 -08:00
smain@google.com
35ee301889 revisions to Studio landing page 
Change-Id: I608b8a63b826f2f2ee2603d7426b501a4df24a38
 2014-12-08 01:26:21 -08:00
Joe Fernandez
3ec76e087c doc: SDK install page fix and link fixes 
- remove remainain ADT install instructions
- fix tools/gradle/ links
- fix tools/basics/ links
- fix tools/workflow/ links (some)

Change-Id: I52c314724250ff3aa2a1b4b1154e1d1ef37f4b81
 2014-12-07 22:58:57 -08:00
Rich Slogar
e3fe9382b9 docs: studio basics v2 [CP] 
Cherry-pick of Change-Id: Ice8e4338f5193f9850da8264a2c56018a8b561ab

Change-Id: I5502cc3c8c2c5b00588b86c995b42913c9a38769
 2014-12-07 19:17:12 -08:00
smain@google.com
cc3b229be6 docs:sdk installing file update 
Change-Id: Iea016bb42df95d19058f261f581482ecc4b8b3b4
 2014-12-05 20:07:57 -08:00