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

3961 Commits

Author SHA1 Message Date
&& repo sync -j8
4233c93901 Merge "Doc Update: param name change" into jb-dev-docs 2012-11-12 14:56:58 -08:00
Joe Fernandez
f8ac34cd39 am 71e862da: am a2b43674: am 95d5be9e: am 0edd4d05: am 180200c2: am aac29f12: Merge "docs: NDK r8c Release Notes" into jb-dev-docs 
* commit '71e862da905f4c414dd93c3e6f1b96840753b3ff':
  docs: NDK r8c Release Notes
 2012-11-12 14:45:12 -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
95d5be9ece am 0edd4d05: am 180200c2: am aac29f12: Merge "docs: NDK r8c Release Notes" into jb-dev-docs 
* commit '0edd4d058e6bf495566961bc52a144cc8a5c21af':
  docs: NDK r8c Release Notes
 2012-11-12 14:37:24 -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
0edd4d058e am 180200c2: am aac29f12: Merge "docs: NDK r8c Release Notes" into jb-dev-docs 
* commit '180200c2c126fc7db1a86ac49a235f40d1905731':
  docs: NDK r8c Release Notes
 2012-11-12 14:35:27 -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
180200c2c1 am aac29f12: Merge "docs: NDK r8c Release Notes" into jb-dev-docs 
* commit 'aac29f126ea8c42313a5481b4871828bbd40b4a6':
  docs: NDK r8c Release Notes
 2012-11-12 14:30:31 -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
aac29f126e Merge "docs: NDK r8c Release Notes" into jb-dev-docs 2012-11-12 14:28:05 -08:00
Joe Fernandez
cee5dab675 Merge "docs: JOBB tool help page" into jb-dev-docs 2012-11-12 14:25:55 -08:00
Quddus Chong
94b3f8eee6 docs: Added new docs for uiautomator testing framework. 
Change-Id: I9fea9e7a711a37bb1f2492b4aa3938e147614125
 2012-11-12 14:23:13 -08:00
Scott Main
1786df7e86 am 842171bd: am 0349ae92: am b9a2a040: Merge "docs: 7 tap instructions for dev options" into jb-mr1-dev 
* commit '842171bd6e88e016f6689f54bc38de1e68357847':
  docs: 7 tap instructions for dev options
 2012-11-12 12:27:58 -08:00
Scott Main
b9a2a0402a Merge "docs: 7 tap instructions for dev options" into jb-mr1-dev 2012-11-12 12:19:21 -08:00
Scott Main
172b9e26bd am dbfa3077: am 51e99cf9: am b50e7e0f: am 65b59f50: am 1af587b3: am 4623c0d8: docs: Add basic tool help pages for SDK and AVD Manager. The SDK Manager page is needed particularly as a reference by some pages rather than pointing to the installation guide. 
* commit 'dbfa30773a0fa47456731351cdfbf0908e5a9fbc':
  docs: Add basic tool help pages for SDK and AVD Manager. The SDK Manager page is needed particularly as a reference by some pages rather than pointing to the installation guide.
 2012-11-12 12:16:29 -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
Scott Main
b50e7e0f8a am 65b59f50: am 1af587b3: am 4623c0d8: docs: Add basic tool help pages for SDK and AVD Manager. The SDK Manager page is needed particularly as a reference by some pages rather than pointing to the installation guide. 
* commit '65b59f5035686f63ebc7d4f8ccc1172b30618ee6':
  docs: Add basic tool help pages for SDK and AVD Manager. The SDK Manager page is needed particularly as a reference by some pages rather than pointing to the installation guide.
 2012-11-12 12:07:47 -08:00
Scott Main
67ba5d189c docs: 7 tap instructions for dev options 
Change-Id: I42867cdf962c0c4231d6037737226381220c6ecf
 2012-11-12 11:24:01 -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
Scott Main
88b0d1e368 am 78f7e807: am e72e2b74: am 85abb087: Merge "docs: update Tools landing page with info for developer options" into jb-mr1-dev 
* commit '78f7e807dfec36fe695f7b2d7241c1a188893d20':
  docs: update Tools landing page with info for developer options
 2012-11-09 22:45:37 -08:00
Scott Main
002618b2e9 docs: update Tools landing page with info for developer options 
Change-Id: I1b2ce4e6a27b365a7ec8823fce56c613b1651b1d
 2012-11-09 20:50:52 -08:00
Katie McCormick
7edb7a509f Doc update: Appwidgets MR1 lockscreen support. 
Change-Id: I637e27aa968614deb1e7f16399f459875ad04130
 2012-11-08 14:59:22 -08:00
Roman Nurik
4b214cddb0 am 7a00ac7c: am a93f94d3: am 512950a9: Merge "docs: Minor Nexus 10 fix in Device Art Generator" into jb-mr1-dev 
* commit '7a00ac7cb74e957bed6580cc209f8035cd34f58d':
  docs: Minor Nexus 10 fix in Device Art Generator
 2012-11-08 06:26:51 -08:00
Scott Main
65b59f5035 am 1af587b3: am 4623c0d8: docs: Add basic tool help pages for SDK and AVD Manager. The SDK Manager page is needed particularly as a reference by some pages rather than pointing to the installation guide. 
* commit '1af587b346035320363a08c190f8b61a69cf0e7c':
  docs: Add basic tool help pages for SDK and AVD Manager. The SDK Manager page is needed particularly as a reference by some pages rather than pointing to the installation guide.
 2012-11-07 17:33:09 -08:00
Scott Main
1af587b346 am 4623c0d8: docs: Add basic tool help pages for SDK and AVD Manager. The SDK Manager page is needed particularly as a reference by some pages rather than pointing to the installation guide. 
* commit '4623c0d842403bf2ae4b622590325c3635aaf563':
  docs: Add basic tool help pages for SDK and AVD Manager. The SDK Manager page is needed particularly as a reference by some pages rather than pointing to the installation guide.
 2012-11-07 17:30:22 -08:00
Scott Main
4623c0d842 docs: Add basic tool help pages for SDK and AVD Manager. 
The SDK Manager page is needed particularly as a reference by
some pages rather than pointing to the installation guide.

Change-Id: Ie835e310f62cdc88bd6318e82f48e36bdd8e117a
 2012-11-07 17:24:25 -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
Roman Nurik
512950a971 Merge "docs: Minor Nexus 10 fix in Device Art Generator" into jb-mr1-dev 2012-11-07 09:49:37 -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
Roman Nurik
b9a870b871 docs: Minor Nexus 10 fix in Device Art Generator 
Change-Id: Ie0fb08d484de812f064d141551963bc37c91267b
 2012-11-06 06:29:07 -08:00
Joe Malin
db426cc0a6 am 046671af: am fbcfb5d0: am 50c2275c: Android Training: CursorLoader 
* commit '046671afbcbe043f0b2aa4edc42b21fd2abf7586':
  Android Training: CursorLoader
 2012-11-05 14:04:09 -08:00
Joe Malin
046671afbc am fbcfb5d0: am 50c2275c: Android Training: CursorLoader 
* commit 'fbcfb5d0f899e0b3c89334d43b45907337cf7f36':
  Android Training: CursorLoader
 2012-11-05 14:01:46 -08:00
Joe Malin
fbcfb5d0f8 am 50c2275c: Android Training: CursorLoader 
* commit '50c2275cff28c4a216f6924584e43cd64b90a3bf':
  Android Training: CursorLoader
 2012-11-05 13:59:48 -08:00
Joe Malin
50c2275cff Android Training: CursorLoader 
Change-Id: Ia8d723b5ce32002597b9444b8c7eff07b1ab29c8
 2012-11-05 13:55:21 -08:00
Scott Main
30fd78e272 am a47776c9: am 2cff3eea: am f19804b5: Merge "new dashboard stats for 11/1, platform version only" into jb-dev-docs 
* commit 'a47776c9f889242b3bcff0ff2d113d50da342262':
  new dashboard stats for 11/1, platform version only
 2012-11-01 15:37:31 -07:00
Scott Main
a47776c9f8 am 2cff3eea: am f19804b5: Merge "new dashboard stats for 11/1, platform version only" into jb-dev-docs 
* commit '2cff3eeaeb419fcdfc7307c2c52a653483c76ddb':
  new dashboard stats for 11/1, platform version only
 2012-11-01 15:34:42 -07:00
Scott Main
2cff3eeaeb am f19804b5: Merge "new dashboard stats for 11/1, platform version only" into jb-dev-docs 
* commit 'f19804b5e994d183e6f6eeb512f74f2380ffd533':
  new dashboard stats for 11/1, platform version only
 2012-11-01 15:31:53 -07:00
Scott Main
f19804b5e9 Merge "new dashboard stats for 11/1, platform version only" into jb-dev-docs 2012-11-01 15:28:34 -07:00
Scott Main
74474e75e0 new dashboard stats for 11/1, platform version only 
Change-Id: If6e9633170793e45abfdc94ef215f45edd64e547
 2012-11-01 15:15:39 -07: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
Joe Malin
1f177cb87a am e639d67a: am d2e16346: am ac294abb: Revision to Notifications API guide 
* commit 'e639d67aeb0e2758f2480c25e8ab007918701ed3':
  Revision to Notifications API guide
 2012-11-01 14:00:54 -07:00
Joe Malin
e639d67aeb am d2e16346: am ac294abb: Revision to Notifications API guide 
* commit 'd2e163461ee8aa79d4560f38e924a7edc44ad4dd':
  Revision to Notifications API guide
 2012-11-01 13:58:02 -07:00