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

1981 Commits

Author SHA1 Message Date
Robert Ly
6519ca0c5f docs: add new GMS landing and reference 
Change-Id: I48c75dd5924bdf297b5368887084d148efcd66ba
 2012-11-27 16:09:58 -08:00
The Android Open Source Project
5132d62600 Merge jb-mr1-dev into aosp/master - do not merge 
Change-Id: Iee4af268c5c2930c59ee237e796467d79cedbbfc
 2012-11-27 08:21:11 -08:00
kmccormick@google.com
836118184c am 0e2c9ee7: am a711d1ee: am 55340e51: am 7112cd46: am 2f9947e9: am ddf10d44: Merge "Doc Update: Removed "no guaranteed delivery" line." into jb-dev-docs 
* commit '0e2c9ee7df465a529fce81cb5016b43bb6423167':
  Doc Update: Removed "no guaranteed delivery" line.
 2012-11-20 08:43:43 -08:00
kmccormick@google.com
55340e5134 am 7112cd46: am 2f9947e9: am ddf10d44: Merge "Doc Update: Removed "no guaranteed delivery" line." into jb-dev-docs 
* commit '7112cd4687687203b35013f197089cb66508a14e':
  Doc Update: Removed "no guaranteed delivery" line.
 2012-11-19 16:58:10 -08:00
kmccormick@google.com
2f9947e9aa am ddf10d44: Merge "Doc Update: Removed "no guaranteed delivery" line." into jb-dev-docs 
* commit 'ddf10d44c12fbd8ffb115c847913296b455f412d':
  Doc Update: Removed "no guaranteed delivery" line.
 2012-11-19 16:53:11 -08:00
&& repo sync -j8
ddf10d44c1 Merge "Doc Update: Removed "no guaranteed delivery" line." into jb-dev-docs 2012-11-19 16:51:09 -08:00
Scott Main
14120b9ce3 am 68395a61: am 0d3eb5f1: am 721b370c: Merge "cherrypick from Change-Id: I70cb9111ff5f5a156cecb433b3baf7925a6be1a8 Fix typo" into jb-mr1-dev 
* commit '68395a61489c560e68a9f8321df96ccdf776d1b6':
  cherrypick from Change-Id: I70cb9111ff5f5a156cecb433b3baf7925a6be1a8 Fix typo
 2012-11-19 11:54:29 -08:00
Jaewan Kim
ff5941399e cherrypick from Change-Id: I70cb9111ff5f5a156cecb433b3baf7925a6be1a8 
Fix typo

Change-Id: Idd09f7fea890dbc290589b1ebe4a1a139f98c740
 2012-11-19 11:43:56 -08:00
kmccormick@google.com
9fd5f0940b am afbf515b: am 47972cea: am 480ac7fc: am 596d0e38: am f53c5f36: am d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docs 
* commit 'afbf515be3ed51cf7db228b52fcc15440310877e':
  Doc Update: Fixing images
 2012-11-15 10:00:12 -08:00
kmccormick@google.com
480ac7fca6 am 596d0e38: am f53c5f36: am d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docs 
* commit '596d0e3881782096f7a6ea9959e8dc5f07004623':
  Doc Update: Fixing images
 2012-11-15 09:51:56 -08:00
kmccormick@google.com
f53c5f3683 am d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docs 
* commit 'd1ae2721fa7b350b979e75319812636ea31bb56b':
  Doc Update: Fixing images
 2012-11-15 09:45:46 -08:00
&& repo sync -j8
d1ae2721fa Merge "Doc Update: Fixing images" into jb-dev-docs 2012-11-15 09:43:18 -08:00
Scott Main
b80d578c8f am 2da041f0: am 0622ed7f: am 0034beab: resolved conflicts for merge of 783e115b to jb-mr1-dev 
* commit '2da041f09d5d68d79b1455aedce6527ea6c5dd89':
  implement new organization for Training classes This also moves a few of the documents from API Guides > Best Practices into the new courses for best practices. This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d which generates the list of classes/lessons on each course landing page.
 2012-11-14 19:17:27 -08:00
Scott Main
0034beab72 resolved conflicts for merge of 783e115b to jb-mr1-dev 
Change-Id: Ibfd3023a845fb6cc549f05bcff2d6e4abc7e5a07
 2012-11-14 19:10:18 -08:00
&& repo sync -j8
1019a9c44e Doc Update: Fixing images 
Bug: 7542170
Change-Id: I18e5d360e21af9d30864456ae429b804314e1edb
 2012-11-14 18:27:36 -08:00
&& repo sync -j8
91cd7a7d52 Doc Update: Removed "no guaranteed delivery" line. 
Change-Id: I6f5b80d263069752b7d47b5825ff024b1858e41e
 2012-11-14 18:15:53 -08:00
Scott Main
e907a3909d am 22cc2764: implement new organization for Training classes This also moves a few of the documents from API Guides > Best Practices into the new courses for best practices. This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d which generates the lis 
* commit '22cc2764cc74e52888b043e0c6371594305bb5e9':
  implement new organization for Training classes This also moves a few of the documents from API Guides > Best Practices into the new courses for best practices. This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d which generates the list of classes/lessons on each course landing page.
 2012-11-14 17:38:15 -08:00
Scott Main
22cc2764cc implement new organization for Training classes 
This also moves a few of the documents from API Guides > Best Practices
into the new courses for best practices.
This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d
which generates the list of classes/lessons on each course landing page.

Change-Id: I8132f72f78d844c3b035c7aa269ad3b88a25d02a
 2012-11-14 17:30:24 -08:00
Scott Main
1286316939 am 1190b77d: am 46ba7860: am 65bd44fe: Merge "docs: add jb mr1 api overview" into jb-mr1-dev 
* commit '1190b77dfa16502117b9c80e4fe4c1a64f4acb28':
  docs: add jb mr1 api overview
 2012-11-13 02:34:10 -08:00
Scott Main
65bd44fe44 Merge "docs: add jb mr1 api overview" into jb-mr1-dev 2012-11-13 02:25:47 -08:00
Scott Main
576552550d docs: add jb mr1 api overview 
Change-Id: I05db9daa6b9b96fef2debabdf35bcbe169fed007
 2012-11-13 02:23:51 -08:00
Robert Ly
d87f1819db am db5fb998: am 0fe6febf: am b03ce7eb: Merge "docs: add fs to rs" into jb-mr1-dev 
* commit 'db5fb998d23da8b71a9b2c5b527832cf9558184c':
  docs: add fs to rs
 2012-11-12 22:30:20 -08:00
Robert Ly
b03ce7eb9f Merge "docs: add fs to rs" into jb-mr1-dev 2012-11-12 22:22:25 -08:00
Robert Ly
3419e07873 docs: add fs to rs 
Change-Id: Icb08977ecf5acbddff35965fa1d7360cece0dd31
 2012-11-12 21:56:32 -08:00
Katie McCormick
52d7404144 am d104705b: am 359c78a6: am f887b563: Merge "Doc update: Appwidgets MR1 lockscreen support." into jb-mr1-dev 
* commit 'd104705b770bcabd1286485686bb8fb262d75ff9':
  Doc update: Appwidgets MR1 lockscreen support.
 2012-11-12 18:29:37 -08:00
Katie McCormick
f887b5631e Merge "Doc update: Appwidgets MR1 lockscreen support." into jb-mr1-dev 2012-11-12 18:22:34 -08:00
kmccormick@google.com
3a5a94b50e am 29f8bbaa: am 30452fb4: am 422b1959: am 76b1be8b: am 39cc8f80: am 4233c939: Merge "Doc Update: param name change" into jb-dev-docs 
* commit '29f8bbaac23deb8e00b7a7a28a29b62e193b8ed8':
  Doc Update: param name change
 2012-11-12 15:12:36 -08:00
kmccormick@google.com
422b19592f am 76b1be8b: am 39cc8f80: am 4233c939: Merge "Doc Update: param name change" into jb-dev-docs 
* commit '76b1be8b78bbb1bdfaf78a848c20b77cb7b0dedf':
  Doc Update: param name change
 2012-11-12 15:05:58 -08:00
kmccormick@google.com
76b1be8b78 am 39cc8f80: am 4233c939: Merge "Doc Update: param name change" into jb-dev-docs 
* commit '39cc8f8079412f721c5003cd2d0cb07366b77da4':
  Doc Update: param name change
 2012-11-12 15:02:55 -08:00
kmccormick@google.com
39cc8f8079 am 4233c939: Merge "Doc Update: param name change" into jb-dev-docs 
* commit '4233c939014c39ce9d95556db1b654e906f8ce5b':
  Doc Update: param name change
 2012-11-12 15:00:12 -08:00
&& repo sync -j8
4233c93901 Merge "Doc Update: param name change" into jb-dev-docs 2012-11-12 14:56:58 -08:00
&& repo sync -j8
2128ec9892 Doc Update: param name change 
Change-Id: I320374f8d40ba090a561fe173bb08837abaa263a
 2012-11-12 14:45:08 -08:00
Joe Fernandez
810b109e6f am f91af1e9: am 207559a2: am fbaa232c: am dddb1e56: am 1c350fa4: am cee5dab6: Merge "docs: JOBB tool help page" into jb-dev-docs 
* commit 'f91af1e9611f5cc695d6134d06348ba433b44bd6':
  docs: JOBB tool help page
 2012-11-12 14:45:08 -08:00
Joe Fernandez
fbaa232c1c am dddb1e56: am 1c350fa4: am cee5dab6: Merge "docs: JOBB tool help page" into jb-dev-docs 
* commit 'dddb1e56d1155327864938373b8b89453024bbea':
  docs: JOBB tool help page
 2012-11-12 14:37:19 -08:00
Joe Fernandez
dddb1e56d1 am 1c350fa4: am cee5dab6: Merge "docs: JOBB tool help page" into jb-dev-docs 
* commit '1c350fa458a6894abb7d4213d65c1c2833faaa7a':
  docs: JOBB tool help page
 2012-11-12 14:33:44 -08:00
Joe Fernandez
1c350fa458 am cee5dab6: Merge "docs: JOBB tool help page" into jb-dev-docs 
* commit 'cee5dab6752a9e793f620981014f3b7cc4f8c137':
  docs: JOBB tool help page
 2012-11-12 14:29:08 -08:00
Joe Fernandez
cee5dab675 Merge "docs: JOBB tool help page" into jb-dev-docs 2012-11-12 14:25:55 -08:00
Katie McCormick
474f356cdd am 9c662274: am c1291f70: am c5b47cff: resolved conflicts for merge of 7f9a0535 to jb-mr1-dev 
* commit '9c66227406bb9c84948a531ec3c4be3641329ddc':
  Doc change: GCM category & dry_run params
 2012-11-12 12:11:48 -08:00
Katie McCormick
c5b47cff88 resolved conflicts for merge of 7f9a0535 to jb-mr1-dev 
Change-Id: I8aee63b128a833ff8c2aaf2167850815033766dd
 2012-11-12 10:07:09 -08:00
Katie McCormick
7edb7a509f Doc update: Appwidgets MR1 lockscreen support. 
Change-Id: I637e27aa968614deb1e7f16399f459875ad04130
 2012-11-08 14:59:22 -08:00
Kenny Root
58ed5d748c am 768d9e1a: Merge "Correct executable bit for source files" 
* commit '768d9e1a72ceee7d4a5f608776b87b62d6ce4a04':
  Correct executable bit for source files
 2012-11-07 11:52:12 -08:00
Kenny Root
3a084af2e9 Correct executable bit for source files 
Many media files and source code files were marked as executable in Git.
Remove those.

Also a shell script and python script were not marked as executable.

Change-Id: Ieb51bafb46c895a21d2e83696f5a901ba752b2c5
 2012-11-07 10:27:31 -08:00
kmccormick@google.com
7f9a053580 am 856e24d8: am fa2dbd69: Merge "Doc change: GCM category & dry_run params" into jb-dev-docs 
* commit '856e24d82a5009db69058b6c37cbbe1af3b292f7':
  Doc change: GCM category & dry_run params
 2012-11-06 15:59:33 -08:00
kmccormick@google.com
856e24d82a am fa2dbd69: Merge "Doc change: GCM category & dry_run params" into jb-dev-docs 
* commit 'fa2dbd693c3ffebd806cbbb4f708f754d58423ed':
  Doc change: GCM category & dry_run params
 2012-11-06 15:56:25 -08:00
&& repo sync -j8
fa2dbd693c Merge "Doc change: GCM category & dry_run params" into jb-dev-docs 2012-11-06 10:38:45 -08:00
Scott Main
465c37533a Merge "docs: misc changes for new manifest attributes, including fix for bug 7443821 bug 7442263" into jb-mr1-dev 2012-11-01 15:14:25 -07:00
Robert Ly
f9e7b61867 am 93a9a0a2: am 0fc15da0: am 677c1e14: Merge "docs: google market -> google play" into jb-dev-docs 
* commit '93a9a0a2bc2173d942f2c37d0751a9e4df8ecb24':
  docs: google market -> google play
 2012-11-01 14:23:30 -07:00
Robert Ly
93a9a0a2bc am 0fc15da0: am 677c1e14: Merge "docs: google market -> google play" into jb-dev-docs 
* commit '0fc15da00597c5a017c1d8eed8f34064c702e4c2':
  docs: google market -> google play
 2012-11-01 14:19:18 -07:00
Robert Ly
0fc15da005 am 677c1e14: Merge "docs: google market -> google play" into jb-dev-docs 
* commit '677c1e14fbd991a46b5496d0873b7ca155fd71fb':
  docs: google market -> google play
 2012-11-01 14:16:47 -07:00
Robert Ly
677c1e14fb Merge "docs: google market -> google play" into jb-dev-docs 2012-11-01 14:14:26 -07:00