Commit graph

11451 commits

Author SHA1 Message Date
Robert Ly
dbfc4bbc95 sac template fixes
Change-Id: I9e3c6b60c1fab71c53408f34d388653e85e6ba30
2013-04-18 11:35:16 -07:00
Dirk Dougherty
b676ec7b1e am 6cdbe88d: am f23bdf78: am 1e1244bf: am a32f1bb4: am 547d9e93: Doc change: css for checklist more resources blocks.
* commit '6cdbe88d0bad6723e50d91585a1f3328e5b77368':
  Doc change: css for checklist more resources blocks.
2013-04-15 20:43:10 -07:00
Dirk Dougherty
6cdbe88d0b am f23bdf78: am 1e1244bf: am a32f1bb4: am 547d9e93: Doc change: css for checklist more resources blocks.
* commit 'f23bdf7843782671f1f15439e4b74cbe56031f8c':
  Doc change: css for checklist more resources blocks.
2013-04-15 20:40:41 -07:00
Dirk Dougherty
f23bdf7843 am 1e1244bf: am a32f1bb4: am 547d9e93: Doc change: css for checklist more resources blocks.
* commit '1e1244bfbe50ff60f8ea6c8a1579c915c1a66232':
  Doc change: css for checklist more resources blocks.
2013-04-15 20:37:59 -07:00
Dirk Dougherty
1e1244bfbe am a32f1bb4: am 547d9e93: Doc change: css for checklist more resources blocks.
* commit 'a32f1bb4e44e932dcb6b1e17fe8c5f2dbb8127df':
  Doc change: css for checklist more resources blocks.
2013-04-15 20:33:54 -07:00
Dirk Dougherty
a32f1bb4e4 am 547d9e93: Doc change: css for checklist more resources blocks.
* commit '547d9e93b21e62f1153aaac49c22b1f648b4fef5':
  Doc change: css for checklist more resources blocks.
2013-04-15 20:30:00 -07:00
Dirk Dougherty
547d9e93b2 Doc change: css for checklist more resources blocks.
Change-Id: If0678b08d135f708bf6ecee49831ef233a862389
2013-04-15 18:45:42 -07:00
Dirk Dougherty
7f8fd3b133 am 7098897f: am 53facc05: am 4f425e42: am 48732d9a: am bec14294: Doc change: css for policy docs.
* commit '7098897fecff6ec586a078025676b8203ab2060d':
  Doc change: css for policy docs.
2013-04-15 15:47:08 -07:00
Dirk Dougherty
7098897fec am 53facc05: am 4f425e42: am 48732d9a: am bec14294: Doc change: css for policy docs.
* commit '53facc05af437f0721646102442c61c49b2e33be':
  Doc change: css for policy docs.
2013-04-15 15:44:44 -07:00
Dirk Dougherty
53facc05af am 4f425e42: am 48732d9a: am bec14294: Doc change: css for policy docs.
* commit '4f425e4284024e21c7e65a7840d8e1a45d916756':
  Doc change: css for policy docs.
2013-04-15 15:41:54 -07:00
Dirk Dougherty
4f425e4284 am 48732d9a: am bec14294: Doc change: css for policy docs.
* commit '48732d9aaa765576d98f07fabd856a17528cb826':
  Doc change: css for policy docs.
2013-04-15 15:37:54 -07:00
Dirk Dougherty
48732d9aaa am bec14294: Doc change: css for policy docs.
* commit 'bec142949a33bf7d195d022e9ec99a1a84197065':
  Doc change: css for policy docs.
2013-04-15 15:34:05 -07:00
Dirk Dougherty
bec142949a Doc change: css for policy docs.
Change-Id: I5d8609d7e20315e5bb022f057704b2814ad9e172
2013-04-11 21:48:54 -07:00
Robert Ly
645c688728 am 7b0422e5: am 969c4c0c: am b6b3da3c: am a4d2d0ef: s.a.c templates
* commit '7b0422e5ba911b8864ed89e76698f9d332732d77':
  s.a.c templates
2013-04-09 13:40:36 -07:00
Robert Ly
7b0422e5ba am 969c4c0c: am b6b3da3c: am a4d2d0ef: s.a.c templates
* commit '969c4c0c3c0d24d00bb27606de477f4c0cfc24fc':
  s.a.c templates
2013-04-09 13:37:01 -07:00
Robert Ly
969c4c0c3c am b6b3da3c: am a4d2d0ef: s.a.c templates
* commit 'b6b3da3c9a095167b0257903234960aac9e80ebb':
  s.a.c templates
2013-04-09 13:33:28 -07:00
Robert Ly
b6b3da3c9a am a4d2d0ef: s.a.c templates
* commit 'a4d2d0ef551f443445a1dffb05f530de32b01fb3':
  s.a.c templates
2013-04-09 13:29:57 -07:00
Robert Ly
a4d2d0ef55 s.a.c templates
Change-Id: Ia6554ba55d10af10227cde336026b51a27307aa0
2013-04-09 11:27:34 -07:00
Robert Ly
f3840a2c2c am 99532a5a: am ad027032: am e046ede5: am 3eba74ff: am ddde20b6: Merge "fix android build number in footer of gms and gcm reference" into jb-mr1-dev
* commit '99532a5aeabe3d55fa99407e948782a6dcf15e5e':
  fix android build number in footer of gms and gcm reference
2013-04-03 13:58:38 -07:00
Robert Ly
99532a5aea am ad027032: am e046ede5: am 3eba74ff: am ddde20b6: Merge "fix android build number in footer of gms and gcm reference" into jb-mr1-dev
* commit 'ad027032b11f592cc58286f535e087053b0220f0':
  fix android build number in footer of gms and gcm reference
2013-04-03 13:56:04 -07:00
Robert Ly
ad027032b1 am e046ede5: am 3eba74ff: am ddde20b6: Merge "fix android build number in footer of gms and gcm reference" into jb-mr1-dev
* commit 'e046ede5350affd49268d35692b5142d1471381d':
  fix android build number in footer of gms and gcm reference
2013-04-03 13:54:00 -07:00
Robert Ly
e046ede535 am 3eba74ff: am ddde20b6: Merge "fix android build number in footer of gms and gcm reference" into jb-mr1-dev
* commit '3eba74ffc1f2a542a0d0376215fb6d2711e7639c':
  fix android build number in footer of gms and gcm reference
2013-04-03 13:52:06 -07:00
Robert Ly
3eba74ffc1 am ddde20b6: Merge "fix android build number in footer of gms and gcm reference" into jb-mr1-dev
* commit 'ddde20b67c521fbd7ad090f7a1e4ab3f69865b4f':
  fix android build number in footer of gms and gcm reference
2013-04-03 13:48:35 -07:00
Robert Ly
ddde20b67c Merge "fix android build number in footer of gms and gcm reference" into jb-mr1-dev 2013-04-03 20:38:55 +00:00
Scott Main
baa0023b9f am 2e5602cd: am 70174c67: am 07e13f7c: am f614554d: load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into n
* commit '2e5602cd6251d7669f5adc9ccda3a5451a0195bd':
  load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into nav.
2013-04-02 13:51:52 -07:00
Scott Main
2e5602cd62 am 70174c67: am 07e13f7c: am f614554d: load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into nav.
* commit '70174c6783f85d105157f2b2207a3d459e966237':
  load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into nav.
2013-04-02 13:47:47 -07:00
Scott Main
70174c6783 am 07e13f7c: am f614554d: load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into nav.
* commit '07e13f7c25d22ac30a59b10feebf92a3d2df6e02':
  load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into nav.
2013-04-02 13:44:22 -07:00
Scott Main
07e13f7c25 am f614554d: load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into nav.
* commit 'f614554daed6b8fe1ff646136a28c8090474b39e':
  load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into nav.
2013-04-02 13:40:05 -07:00
Scott Main
f614554dae load google API navtree ondemand (remove request from <head>).
Also move the code for highlighting the sidenav into a separate method
that we can call at a later time, such as after the gms reference is loaded into nav.

Change-Id: I924d68b2b9dbfed83f81d1fd418e06b6c79a9010
2013-04-01 16:38:11 -07:00
Brian Carlstrom
9a3b17d184 am 923ac1a8: Merge "Added local variable info output to javac command for host build."
* commit '923ac1a8717f38f116708c259b8d75bc303abd5a':
  Added local variable info output to javac command for host build.
2013-03-27 16:40:25 -07:00
Scott Main
6c3f41ac7c am a6188a56: am 972c3798: am 28ca0f32: am 25e7300c: load the navtree javascript on demand; don\'t try setting up the tree until it\'s loaded
* commit 'a6188a56ea8f10a3ce81fb95fbf508cae688c4b1':
  load the navtree javascript on demand; don't try setting up the tree until it's loaded
2013-03-27 16:10:10 -07:00
Scott Main
a6188a56ea am 972c3798: am 28ca0f32: am 25e7300c: load the navtree javascript on demand; don\'t try setting up the tree until it\'s loaded
* commit '972c3798890f8b0e20005eece62ee88f508dd761':
  load the navtree javascript on demand; don't try setting up the tree until it's loaded
2013-03-27 16:07:57 -07:00
Scott Main
972c379889 am 28ca0f32: am 25e7300c: load the navtree javascript on demand; don\'t try setting up the tree until it\'s loaded
* commit '28ca0f324454faa3c6d40331ecb3abb1c1a13d74':
  load the navtree javascript on demand; don't try setting up the tree until it's loaded
2013-03-27 16:05:56 -07:00
Scott Main
28ca0f3244 am 25e7300c: load the navtree javascript on demand; don\'t try setting up the tree until it\'s loaded
* commit '25e7300c2499d0ecaad91aecc3fbf988c59fc7da':
  load the navtree javascript on demand; don't try setting up the tree until it's loaded
2013-03-27 16:03:55 -07:00
Scott Main
25e7300c24 load the navtree javascript on demand; don't try setting up the tree until it's loaded
Change-Id: I1f209869a17099dd853a2f4cae766481a6cd03eb
2013-03-27 15:49:14 -07:00
Brian Carlstrom
923ac1a871 Merge "Added local variable info output to javac command for host build." 2013-03-27 22:44:30 +00:00
jeffhao
dc6757a4ce Added local variable info output to javac command for host build.
The host java files weren't being compiled with -g.

(cherry-picked from 3a971f734060d19fc023ccf82e39d956a31b7cfb)

Change-Id: I4274910c64ebf52ec955e30e800b34fc309db27b
2013-03-26 22:26:44 -07:00
Geremy Condra
e8c9e82db0 am 50585e76: Merge "Add sepolicy and mac_perms to installclean"
* commit '50585e76fd13eb3d91f8d9e9e7ae5e1a3cd1ae86':
  Add sepolicy and mac_perms to installclean
2013-03-26 16:39:22 -07:00
Geremy Condra
50585e76fd Merge "Add sepolicy and mac_perms to installclean" 2013-03-26 22:35:50 +00:00
William Roberts
a8b3d54101 Add sepolicy and mac_perms to installclean
Remove the output files for SELinux policy
and mac_permissions.xml mapping for changes
between user and eng build.

Change-Id: Ie27dcedde0c22ce917d90466a763698c86919530
2013-03-26 14:54:51 -07:00
The Android Open Source Project
545c8eed67 Reconcile with jb-mr1.1-release - do not merge
Change-Id: Ia0536d6a75f255879a24145def55c44c93050aaa
2013-03-26 10:53:09 -07:00
Scott Main
964c6321ae am 709fcf04: am 2325250e: am 9ae6d37a: am de295276: add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google
* commit '709fcf04a0294544658166a10021978870d756ef':
  add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google
2013-03-25 16:17:42 -07:00
Scott Main
709fcf04a0 am 2325250e: am 9ae6d37a: am de295276: add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google
* commit '2325250e639f3c443a8ccd006f0d591eb8f1c5d3':
  add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google
2013-03-25 16:15:12 -07:00
Scott Main
2325250e63 am 9ae6d37a: am de295276: add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google
* commit '9ae6d37ad09cad5eb3e0caa2f0b4c0a507a243f2':
  add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google
2013-03-25 16:13:29 -07:00
Scott Main
9ae6d37ad0 am de295276: add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google
* commit 'de2952768478e6390bcec424bb102911e7f4cbff':
  add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google
2013-03-25 16:11:44 -07:00
Scott Main
de29527684 add javascript action events to search suggestions and search results.
Allows us to track and compare the success of suggested results and results from Google

Change-Id: I64750e3b96ea585de415969cad8ab46c3bbbcaf4
2013-03-25 15:54:05 -07:00
Ying Wang
ca983c08fb am 97c280ec: Merge "We have to use := instead of +="
* commit '97c280eced879fb79d32bd527412ab34840dba5c':
  We have to use := instead of +=
2013-03-22 19:47:43 -07:00
Ying Wang
97c280eced Merge "We have to use := instead of +=" 2013-03-23 01:56:36 +00:00
Ying Wang
4d063410a3 We have to use := instead of +=
If we use +=, the right side may be deferred to evaluate,
if that target-specific variable is not defined yet.
That's a mistke.

Change-Id: I1635ee4791473f407866e010d612948c02cdebf6
2013-03-22 18:52:57 -07:00
Scott Main
159de1de00 am 1b8b0cfe: am 79088780: am 8d92d9ef: am 01a2545b: docs: update templates to remove global content for devsite builds
* commit '1b8b0cfee98c8d2779dc740707b547846734053f':
  docs: update templates to remove global content for devsite builds
2013-03-21 18:33:53 -07:00