Commit graph

6414 commits

Author SHA1 Message Date
Ying Wang
2a71850eb3 Merge "Generate an empty target if there is no packages" 2011-09-27 11:31:12 -07:00
The Android Open Source Project
e1d6068bd7 Reconcile with ics-factoryrom-release
Change-Id: I4a1591c4e7c75bd09c41545138467fab6d24c78b
2011-09-27 10:10:37 -07:00
The Android Automerger
b47d59b7e6 IFK89 2011-09-27 04:21:49 -07:00
The Android Automerger
368ef9e2dc merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-27 04:18:29 -07:00
The Android Automerger
960696c989 IFK88C 2011-09-27 03:56:33 -07:00
The Android Automerger
5038b62879 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-27 03:51:01 -07:00
The Android Automerger
9a8ae73c80 IFK88B 2011-09-26 16:20:08 -07:00
The Android Automerger
836af34cde merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-26 16:15:39 -07:00
Jean-Baptiste Queru
e1891b7945 Merge "resolved conflicts for merge of 2f2882a0 to master" 2011-09-26 13:24:33 -07:00
The Android Open Source Project
57a4eaf4ba Reconcile with ics-factoryrom-release
Change-Id: Idd580f068a34956ba60f34552485123de030ef31
2011-09-26 12:11:20 -07:00
Ying Wang
f272cd6c22 Generate an empty target if there is no packages
Generate an empty target even if there is no packages defined in the
source tree. Such case can happen when building in an unbundled branch.

Change-Id: Id8b94bc00557cd5ea2066859e440427474ced5f5
2011-09-26 12:05:06 -07:00
The Android Automerger
cd38267ad0 IFK88 2011-09-26 06:34:40 -07:00
The Android Automerger
64757ae843 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-26 06:32:18 -07:00
The Android Automerger
5dde569675 IFK87B 2011-09-25 18:18:02 -07:00
The Android Automerger
5ed0eef39b merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-25 18:14:09 -07:00
The Android Automerger
9135295326 IFK87 2011-09-25 06:32:51 -07:00
The Android Automerger
49762cba79 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-25 06:27:14 -07:00
The Android Automerger
ce45eaefa3 IFK85C 2011-09-23 17:57:20 -07:00
Christopher Tate
ff4bf22fb4 Add the shared-storage backup component to the build
Oops.  Fixes bug 5341264

Change-Id: I99c51226c236c40bf56b1b94917f0eff56502963
2011-09-23 17:57:12 -07:00
Ying Wang
3aa2c174ec am 510df1bb: Add lohit-fonts.
* commit '510df1bb0904292a23b7f12e06fdf7e9307298e4':
  Add lohit-fonts.
2011-09-23 16:25:36 -07:00
Ying Wang
510df1bb09 Add lohit-fonts.
Change-Id: Idf0641ce2d8f8195520e7e283f985271482b2835
2011-09-23 14:35:51 -07:00
Doug Zongker
48c3de5f88 Merge "fix syntax error in OTA script" 2011-09-23 13:51:54 -07:00
The Android Automerger
7e5ef3b42c IFK85B 2011-09-23 13:39:09 -07:00
Christopher Tate
0d2696162d am 1014de6c: Merge "Add the shared-storage backup component to the build" into ics-factoryrom
* commit '1014de6cf3b90c6c531beaf8462c17a5f39a8e35':
  Add the shared-storage backup component to the build
2011-09-23 13:00:52 -07:00
Christopher Tate
1014de6cf3 Merge "Add the shared-storage backup component to the build" into ics-factoryrom 2011-09-23 12:59:28 -07:00
Doug Zongker
91b4f8a850 fix syntax error in OTA script
Change-Id: I3a9535acb47fc3960020a390dec8d0294a404c2e
2011-09-23 12:48:33 -07:00
The Android Automerger
9a2084906f IFK85 2011-09-23 11:38:53 -07:00
The Android Automerger
97e51a7ae8 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-23 11:33:21 -07:00
David 'Digit' Turner
becc3da915 resolved conflicts for merge of 2f2882a0 to master
Change-Id: Ia07eb9d022a8036c2b1674c591514740aa0d4596
2011-09-23 11:44:29 +02:00
Xavier Ducrohet
280cc66558 am 4d2b9bf3: (-s ours) Cherrypick 6de7bc61 from master. do not merge.
* commit '4d2b9bf341e7978225d6a305c2524ff79f2d18c5':
  Cherrypick 6de7bc61 from master. do not merge.
2011-09-22 23:39:44 -07:00
David 'Digit' Turner
2f2882a04e am fdb13fcc: am 0cc5e1ef: Merge "sdk: Fix broken google_sdk and google_sdk_x86 add-on build." into gingerbread
* commit 'fdb13fccfecdf526549ad453a20e8136253edb51':
  sdk: Fix broken google_sdk and google_sdk_x86 add-on build.
2011-09-22 23:01:17 -07:00
David 'Digit' Turner
fdb13fccfe am 0cc5e1ef: Merge "sdk: Fix broken google_sdk and google_sdk_x86 add-on build." into gingerbread
* commit '0cc5e1ef457f0eda3a3dfadc094b0e796ba9f3f2':
  sdk: Fix broken google_sdk and google_sdk_x86 add-on build.
2011-09-22 22:59:07 -07:00
David 'Digit' Turner
0cc5e1ef45 Merge "sdk: Fix broken google_sdk and google_sdk_x86 add-on build." into gingerbread 2011-09-22 22:58:04 -07:00
Christopher Tate
6e2ba5240e Add the shared-storage backup component to the build
Oops.  Fixes bug 5341264

Change-Id: I99c51226c236c40bf56b1b94917f0eff56502963
2011-09-22 18:24:30 -07:00
The Android Automerger
17eb572d67 IFK84B 2011-09-22 15:43:11 -07:00
The Android Open Source Project
6eb7db4263 Reconcile with honeycomb-LTE-release ics-factoryrom-release
Change-Id: I1e685412c0dc344067dbeb698d54b638fe3f5bf5
2011-09-22 10:57:14 -07:00
Doug Zongker
afb32eaca0 change OTA tools to handle variable dev keys
The signing and OTA-building tools now understand the
default_sys_dev_certificate value which may be present in the
META/misc_info.txt file of the target-files packages.

Change-Id: I64f09ec0b77a5184b6ddb74019255518776ee773
2011-09-22 10:28:04 -07:00
The Android Automerger
1dc69df9a7 IFK84 2011-09-22 06:31:13 -07:00
The Android Automerger
02dfd9bb89 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-22 06:27:14 -07:00
Scott Main
146e2fa72c Merge "docs: enable 'updated' tag for resource docs" 2011-09-21 21:07:57 -07:00
Scott Main
99113abd2a docs: enable 'updated' tag for resource docs
Change-Id: I070f14247088f6a88dcfdfb352615e588bf3e902
2011-09-21 20:52:47 -07:00
Scott Main
b0b081e2ee Merge "docs: fix javadoc filtering script to not choke on R.styleable class but continue handling provisional api levels" 2011-09-21 18:51:54 -07:00
Scott Main
219a267408 docs: fix javadoc filtering script to not choke on R.styleable class but continue handling provisional api levels
Change-Id: Ia21ea5d4f379fd85d975d1f3fe387c311c7c15aa
2011-09-21 18:38:44 -07:00
Dianne Hackborn
228fd69eaf Merge "Let's call MR0 4.0.1." 2011-09-21 18:11:44 -07:00
Xavier Ducrohet
4d2b9bf341 Cherrypick 6de7bc61 from master. do not merge.
Copy notice file in the new system image folder

Change-Id: I66496f382b2d13b030de569b573630f3abe5b9de
2011-09-21 16:03:19 -07:00
Xavier Ducrohet
aabcd6a595 Merge "Copy notice file in the new system image folder" 2011-09-21 15:55:04 -07:00
Dianne Hackborn
7766ea2884 Let's call MR0 4.0.1.
Change-Id: Ie55012702e2cfb1eb247941e8b73519ad9b5c547
2011-09-21 15:25:37 -07:00
Xavier Ducrohet
6de7bc611b Copy notice file in the new system image folder
Change-Id: I4fafe5dc9dc1749de56267206a9b847a97e6a14b
2011-09-21 14:25:52 -07:00
The Android Automerger
fea886cf03 IFK83B 2011-09-21 12:44:06 -07:00
The Android Automerger
87b32f28c9 HLK75C 2011-09-21 11:12:05 -07:00