Commit Graph

14778 Commits

Author SHA1 Message Date
Scott Main 9526eefbf3 am 4e5b39d8: style adjustment to design/dev/video buttons
* commit '4e5b39d843548acaac73d1d1f729324805eda0a8':
  style adjustment to design/dev/video buttons
2013-11-14 02:08:29 +00:00
Scott Main 4e5b39d843 style adjustment to design/dev/video buttons
Change-Id: I97a147336805aeb340efcd12009794b02afab681
2013-11-13 16:49:22 -08:00
Ed Heyl 4fdf4df977 am 2c8415fb: am eebb7301: merge in release branch changes (no-op).
* commit '2c8415fb088dcc2adde6c666f979159552609bbc':
  "KOT43B"
  "KOT43"
  KOT42B
  "KOT42"
  "KOT41B"
  "KOT41"
  "KOT38D"
2013-11-13 15:31:00 -08:00
Ed Heyl 2c8415fb08 am eebb7301: merge in release branch changes (no-op).
* commit 'eebb7301b4de7c9767ef8794af34cd728bf78e06':
  "KOT43B"
  "KOT43"
  KOT42B
  "KOT42"
  "KOT41B"
  "KOT41"
  "KOT38D"
2013-11-13 15:26:51 -08:00
Ed Heyl eebb7301b4 merge in release branch changes (no-op). 2013-11-13 15:19:15 -08:00
The Android Automerger 01b8d0a31c "KOT43B" 2013-11-12 20:00:54 -08:00
The Android Automerger c65f13943c merge in klp-mr1-release history after reset to klp-dev 2013-11-12 20:00:37 -08:00
The Android Automerger 76936b16c6 "KOT43" 2013-11-12 17:25:32 -08:00
The Android Automerger f78ba11e70 merge in klp-mr1-release history after reset to klp-dev 2013-11-12 17:24:10 -08:00
Baligh Uddin 38f1aed01d am dcc645eb: am dd00a967: Merge "Revert the revert. (its time to sign MR1)" into klp-dev
* commit 'dcc645ebb1a87982d2a067b8584ff167ae2c5287':
  Revert the revert. (its time to sign MR1)
2013-11-12 16:46:48 -08:00
Baligh Uddin dcc645ebb1 am dd00a967: Merge "Revert the revert. (its time to sign MR1)" into klp-dev
* commit 'dd00a9677b21d2dbdef6b085570e1358f172de80':
  Revert the revert. (its time to sign MR1)
2013-11-12 16:42:25 -08:00
Baligh Uddin dd00a9677b Merge "Revert the revert. (its time to sign MR1)" into klp-dev 2013-11-13 00:38:47 +00:00
Baligh Uddin beb6afdee2 Revert the revert. (its time to sign MR1)
Revert "Waiting till post MR0 - this impacts signing tools for MR0."

This reverts commit a7b5c4a7dc.

Bug: 11334314
Change-Id: I89f8996161e4258b80bf2d0bc7817f0e8e32df13
2013-11-13 00:23:10 +00:00
Scott Main ab5808b007 am 680821ed: am 13cd8f15: add style for video button in docs
* commit '680821ed27a2a2dfce7298434307065aa5ed56aa':
  add style for video button in docs
2013-11-12 12:22:03 -08:00
Scott Main ec5b24f473 am faff9f52: am 641c2c2f: clarify the hidden APIs in reference with better tooltips
* commit 'faff9f52c1882d4a2eadce90bf90b0fbd7082632':
  clarify the hidden APIs in reference with better tooltips
2013-11-12 12:22:02 -08:00
Scott Main 0e3851ddf2 am 6ca30dab: am 03aca9a7: script to handle new static landing pages for sample topics
* commit '6ca30dab2ad44318541dea0da28c247c49a3f79e':
  script to handle new static landing pages for sample topics
2013-11-12 12:22:02 -08:00
Scott Main d488018571 am 4a557dc9: am f1435b73: remove the dummy sidenav from samples before populating the real list. Also make the line numbers hidden before they get moved to avoid some jankyness during load.
* commit '4a557dc958028c46e7fa5d6b1d4661bfda8c7f23':
  remove the dummy sidenav from samples before populating the real list. Also make the line numbers hidden before they get moved to avoid some jankyness during load.
2013-11-12 12:22:01 -08:00
Scott Main 82260f423b am e84e4c20: am 70557ee5: make expandable lists under each sample sticky so they don\'t collapse when opening other project directories.
* commit 'e84e4c20d2e34f13b4c158494caac28e22f6c18e':
  make expandable lists under each sample sticky so they don't collapse when opening other project directories.
2013-11-12 12:22:00 -08:00
Scott Main 680821ed27 am 13cd8f15: add style for video button in docs
* commit '13cd8f15476ec66145b3685ca5ce181491fe28c0':
  add style for video button in docs
2013-11-12 20:18:38 +00:00
Scott Main faff9f52c1 am 641c2c2f: clarify the hidden APIs in reference with better tooltips
* commit '641c2c2fdaf68fa48b044177fef7c890a42c8a11':
  clarify the hidden APIs in reference with better tooltips
2013-11-12 20:18:38 +00:00
Scott Main 6ca30dab2a am 03aca9a7: script to handle new static landing pages for sample topics
* commit '03aca9a71235d3a79bf47631103ff42862af6adc':
  script to handle new static landing pages for sample topics
2013-11-12 20:18:38 +00:00
Scott Main 4a557dc958 am f1435b73: remove the dummy sidenav from samples before populating the real list. Also make the line numbers hidden before they get moved to avoid some jankyness during load.
* commit 'f1435b73bd373cad0bcd06f38f458f8706e07162':
  remove the dummy sidenav from samples before populating the real list. Also make the line numbers hidden before they get moved to avoid some jankyness during load.
2013-11-12 20:18:38 +00:00
Scott Main e84e4c20d2 am 70557ee5: make expandable lists under each sample sticky so they don\'t collapse when opening other project directories.
* commit '70557ee5fc71cc6b61c3a84ea28e97bd40573779':
  make expandable lists under each sample sticky so they don't collapse when opening other project directories.
2013-11-12 20:18:38 +00:00
Scott Main 13cd8f1547 add style for video button in docs
Change-Id: I2f2dcf80aef9c55ad6a11f13549b8dd8709cbc84
2013-11-12 11:55:24 -08:00
The Android Automerger d09cec9a3b KOT42B 2013-11-11 15:50:17 -08:00
The Android Automerger 1947748217 "KOT42" 2013-11-11 10:50:43 -08:00
The Android Automerger 67c8a2d207 merge in klp-mr1-release history after reset to klp-dev 2013-11-11 10:50:07 -08:00
The Android Automerger 83a88bf023 "KOT41B" 2013-11-10 10:04:50 -08:00
The Android Automerger 6f5a0122ab "KOT41" 2013-11-10 06:01:59 -08:00
The Android Automerger e79ab9b36c merge in klp-mr1-release history after reset to klp-dev 2013-11-10 06:00:23 -08:00
Elliott Hughes 693a26ba55 am f8c5a6ae: am bd10e2c0: Merge "Switch x86_64 over to uapi headers."
* commit 'f8c5a6ae006cfa8a6e30b850cbf930a043e5e842':
  Switch x86_64 over to uapi headers.
2013-11-08 14:54:12 -08:00
Elliott Hughes f8c5a6ae00 am bd10e2c0: Merge "Switch x86_64 over to uapi headers."
* commit 'bd10e2c019b9f6a6e13f050c0e52924f456e482f':
  Switch x86_64 over to uapi headers.
2013-11-08 14:52:30 -08:00
Elliott Hughes bd10e2c019 Merge "Switch x86_64 over to uapi headers." 2013-11-08 22:50:55 +00:00
Elliott Hughes 600b973722 Switch x86_64 over to uapi headers.
Bug: 11559337
Change-Id: Ia0a8dff9194375172d1c89daae917d2d8952ace7
2013-11-08 14:47:10 -08:00
Ed Heyl efc277ddf1 am 5b684e99: merge in release branch changes (no-op).
* commit '5b684e9972b5fc3efa1814ae9b5d68ac49a60f79':
  "KOT38C"
  "KOT38B"
  "KOT38"
  "KOT37B"
  "KOT37"
  "KOT36"
  "KOT35B"
  "KOT35"
  KOT31C
  "KOT31B"
  "KOT32"
  "KOT31"
  "KOT30"
  "KOT29"
  "KOT28"
  "KOT24"
  "KOT23"
  "KOT22"
  "KOT21"
  "KOT18"
2013-11-08 13:59:49 -08:00
The Android Automerger 9c9b87800e "KOT38D" 2013-11-08 13:46:12 -08:00
Raphael Moll e9966aab80 am 79a9a324: am 3342bf0f: Merge "Windows SDK: define BEGIN_DECLS/END_DECLS."
* commit '79a9a3243ae701e7bc40b85b4a085ad91821d921':
  Windows SDK: define BEGIN_DECLS/END_DECLS.
2013-11-08 13:38:54 -08:00
Raphael Moll 79a9a3243a am 3342bf0f: Merge "Windows SDK: define BEGIN_DECLS/END_DECLS."
* commit '3342bf0fea22efeb3df0a4e3a3c50fb78ecf96ff':
  Windows SDK: define BEGIN_DECLS/END_DECLS.
2013-11-08 13:36:17 -08:00
Raphael Moll 3342bf0fea Merge "Windows SDK: define BEGIN_DECLS/END_DECLS." 2013-11-08 21:33:58 +00:00
Ed Heyl 5b684e9972 merge in release branch changes (no-op). 2013-11-08 13:23:43 -08:00
Raphael Moll b9c20aa8ba Windows SDK: define BEGIN_DECLS/END_DECLS.
These macros are not provided by MingW by default.

Change-Id: I623fda6c8e25e26573543c9368ebad47abc7f5c3
2013-11-08 11:40:41 -08:00
Jeff Brown c4c92f1c73 am e17927e0: Merge "Add a platform library for remote display providers." into klp-dev
* commit 'e17927e0859778638781d75e33a3d4c5184583c4':
  Add a platform library for remote display providers.
2013-11-07 17:44:06 -08:00
Jeff Brown e17927e085 Merge "Add a platform library for remote display providers." into klp-dev 2013-11-08 01:37:12 +00:00
The Android Automerger 626fee479e "KOT38C" 2013-11-07 17:04:53 -08:00
Michael Runge 3b44339d6a am 37335b42: Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add.
* commit '37335b42385970d957d48056145a3d4c4dbc6087':
  Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add.
2013-11-07 15:00:42 -08:00
The Android Automerger c2200d9a37 "KOT38B" 2013-11-07 14:40:43 -08:00
Michael Runge 37335b4238 Enable incremental builder to find files that moved, and
try to process them via patch + rename, instead of
delete + add.

b/11437930

Change-Id: Ie70632a2fa0a13d4bb259f61c620bb01812494e5
2013-11-07 11:36:03 -08:00
Elliott Hughes 36e681b02a resolved conflicts for merge of 12f87a5b to klp-dev-plus-aosp
Change-Id: I8ce0a86bbaae0c1e3ce5ed46de628ea22ea17d16
2013-11-07 09:08:00 -08:00
Elliott Hughes 12f87a5b77 am a05365ce: Merge "Remove the hacks needed to support ash and mksh concurrently."
* commit 'a05365ceceaead86651f61f7ba66153e36b7be5d':
  Remove the hacks needed to support ash and mksh concurrently.
2013-11-07 08:35:17 -08:00
Elliott Hughes a05365cece Merge "Remove the hacks needed to support ash and mksh concurrently." 2013-11-07 16:07:32 +00:00