Commit graph

14286 commits

Author SHA1 Message Date
Ying Wang
c6e09b9890 am 0790dcfd: am 2e45116d: am 515e0465: Merge "FDO: do not support host modules"
* commit '0790dcfd3b52a16dccc118577bf154c83162bec1':
  FDO: do not support host modules
2013-12-05 19:38:11 +00:00
Alex Ray
57891b91ef DO NOT MERGE: tiny: generic product configs for super-low-mem devices
and no telephony

Change-Id: Iaebbb21fd7eb01a3d8070684abd3b683a7d0b027
2013-12-02 07:41:51 -08:00
Doug Zongker
816d73f9eb store releasetools.py in the target_files zip
Save the device-specific releasetools.py module in the target_files
zip so that the OTA tools can use it without needing to get it from a
client.

Change-Id: I2dd5f4628290a8f2f56bd519b07d4ca8d92fddcd
2013-11-22 13:29:55 -08:00
Dave Langemak
96f56b6fcb Merge "Revert "Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add."" into klp-dev 2013-11-22 01:08:53 +00:00
Michael Runge
90c60d3b92 Revert "Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add."
This reverts commit 37335b4238.

Change-Id: I61cc125d3b08eaa300a7774b6607dbb43f0e7148
2013-11-22 00:52:51 +00:00
Dianne Hackborn
221fcf3183 Merge "Just a little .1 makes all the difference in the world." into klp-dev 2013-11-14 22:53:55 +00:00
Dianne Hackborn
b6ab1203fb Just a little .1 makes all the difference in the world.
Change-Id: I4c4d8f507f9e81a632e22612043dc904694c5497
2013-11-14 12:06:49 -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
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
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
The Android Automerger
9c9b87800e "KOT38D" 2013-11-08 13:46:12 -08:00
Ed Heyl
5b684e9972 merge in release branch changes (no-op). 2013-11-08 13:23:43 -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
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
The Android Automerger
33fff9d4e0 "KOT38" 2013-11-07 06:02:30 -08:00
The Android Automerger
8f163e89ba merge in klp-mr1-release history after reset to klp-dev 2013-11-07 06:00:31 -08:00
The Android Automerger
357d3f99e0 "KOT37B" 2013-11-06 15:14:20 -08:00
The Android Automerger
21c385a3b4 "KOT37" 2013-11-06 06:02:35 -08:00
The Android Automerger
a8011a2342 merge in klp-mr1-release history after reset to klp-dev 2013-11-06 06:00:25 -08:00
Jeff Brown
2cbae109be Add a platform library for remote display providers.
Bug: 11257292
Change-Id: Ia0207010c2f3ae143b483e9c1aa6643142740312
2013-11-05 22:17:57 -08:00
The Android Automerger
a4ca785f4a "KOT36" 2013-11-05 06:05:13 -08:00
The Android Automerger
6a54ed4214 merge in klp-mr1-release history after reset to klp-dev 2013-11-05 06:03:41 -08:00
The Android Automerger
fbc20a9bec "KOT35B" 2013-11-04 14:43:58 -08:00
The Android Automerger
23d14d8bef "KOT35" 2013-11-04 06:02:25 -08:00
The Android Automerger
606c2f143d merge in klp-mr1-release history after reset to klp-dev 2013-11-04 06:00:28 -08:00
The Android Automerger
946717af04 KOT31C 2013-11-03 17:59:15 -08:00
The Android Automerger
6e56ac642e "KOT31B" 2013-11-01 12:58:12 -07:00
The Android Automerger
fdcdd452eb "KOT32" 2013-11-01 12:57:01 -07:00
Scott Main
241dbd1565 script to handle new static landing pages for sample topics
Change-Id: If90531da327e2d664ca7856af6a9737ea1879eaa
2013-10-31 07:27:10 -07:00
The Android Automerger
b81eeb585f "KOT31" 2013-10-31 06:02:23 -07:00
The Android Automerger
7dd5e73ac3 merge in klp-mr1-release history after reset to klp-dev 2013-10-31 06:00:16 -07:00
Scott Main
36ea7a3d74 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.

Change-Id: I11c3df6d6c7a9a2e74be938b0f0ec704e71eb8d4
2013-10-30 16:29:22 -07:00
Scott Main
e9fbac49bb make expandable lists under each sample sticky so they don't collapse
when opening other project directories.

change code comment color from red to green, and strings from green to red.
Make sidenav file names smaller.

Change-Id: Idd074c7beba48f79c8c551d319c36fb5ecbbcb5f
2013-10-30 15:19:41 -07:00
The Android Automerger
8cdb1274ae "KOT30" 2013-10-30 06:01:53 -07:00
The Android Automerger
5120a69645 merge in klp-mr1-release history after reset to klp-dev 2013-10-30 06:00:21 -07:00
Dirk Dougherty
3c0c127468 Merge "Add n5 landscape-13 device video frame and css." into klp-dev 2013-10-30 01:27:10 +00:00
Dirk Dougherty
57ab94354c Merge "Adjust samples output pages." into klp-dev 2013-10-29 23:35:12 +00:00
Dirk Dougherty
ca1858aca9 Add n5 landscape-13 device video frame and css.
Change-Id: I3b18782680e74bd8d4022e6701bfd61887101cf1
2013-10-29 16:25:00 -07:00