Commit Graph

6802 Commits

Author SHA1 Message Date
The Android Automerger 5fb68024fc ICL13B 2011-10-13 16:59:53 -07:00
The Android Automerger 119e4f42f8 merge in ics-mr0-release history after reset to ics-mr0 2011-10-13 16:56:58 -07:00
The Android Open Source Project df9a8ab186 Reconcile with ics-mr0-release
Change-Id: I58ba7ea1f3e87dcc5fc13ce213a221a311dc4eff
2011-10-13 07:04:45 -07:00
The Android Automerger 3b21f2e98c ICL13 2011-10-13 06:30:07 -07:00
The Android Automerger 5a528334cd merge in ics-mr0-release history after reset to ics-mr0 2011-10-13 06:27:08 -07:00
Dima Zavin 5fc85c6bfe am 854233e9: core: remove the built fake packages (not installed) on installclean
* commit '854233e9b2e24c75f63db96bb1be9a7bb2cecd84':
  core: remove the built fake packages (not installed) on installclean
2011-10-12 13:50:40 -07:00
Dima Zavin 854233e9b2 core: remove the built fake packages (not installed) on installclean
Change-Id: I1ff3754132a48c545d0a3215ae23d204aba50637
Signed-off-by: Dima Zavin <dima@android.com>
2011-10-12 13:34:32 -07:00
The Android Automerger d0345b852b ICL12B 2011-10-12 13:30:05 -07:00
Yuli Huang 6f081c3a12 am 5b124642: Remove PhotoEditor from mk file.
* commit '5b124642b53c6545b8d353f50e05229350f89e13':
  Remove PhotoEditor from mk file.
2011-10-12 09:37:35 -07:00
Yuli Huang 5b124642b5 Remove PhotoEditor from mk file.
Change-Id: Ia650e4dac0babb82fe2cb43073126f9e93b57362
2011-10-13 00:28:28 +08:00
The Android Open Source Project 3a8c9a112e Reconcile with ics-factoryrom-release ics-mr0-release
Change-Id: Ic2b248f0ade713e7ba984cbe093afe50bc931ad2
2011-10-12 08:48:41 -07:00
The Android Automerger 06a1b866cd ICL12 2011-10-12 07:06:18 -07:00
The Android Automerger 81554fced4 merge in ics-mr0-release history after reset to ics-mr0 2011-10-12 06:22:34 -07:00
The Android Automerger 137b552fd3 IFL10C 2011-10-11 18:08:39 -07:00
Dima Zavin eee20ca405 am 7dac5909: core: remove fake package timestamps on installclean
* commit '7dac5909d23a78ff6ed2af6e4d937354de8c7756':
  core: remove fake package timestamps on installclean
2011-10-11 17:32:50 -07:00
Dima Zavin 7dac5909d2 core: remove fake package timestamps on installclean
Change-Id: Ic07af1f751b301b69fa5cbbb7bf51ad718d54d52
Signed-off-by: Dima Zavin <dima@android.com>
2011-10-11 15:54:10 -07:00
Ying Wang d89452976b Merge "Use shell variable to eliminate $(eval) in commands." 2011-10-11 10:11:44 -07:00
Android Git Automerger 861348a4be Merge branch 'master' of ssh://android-git:29418/platform/build 2011-10-11 10:10:35 -07:00
Ying Wang e27347e7a4 Merge "Enforce no nonexistent modules in PRODUCT_PACKAGES for sdk builds" 2011-10-11 10:01:50 -07:00
Ying Wang 5e55001859 Merge "Remove PRODUCT_CONTRIBUTORS_FILE which is no longer in use." 2011-10-11 10:01:25 -07:00
The Android Automerger f92a92e5a4 IFL10B 2011-10-11 08:46:03 -07:00
The Android Automerger e46f8e1119 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-10-11 08:40:03 -07:00
Ed Heyl 738f053bf3 mr0 - do not merge
Change-Id: I3b19b8cdad6820bc8ab2047ac48cb2964132a3fa
2011-10-11 06:40:06 -07:00
Ed Heyl 332d70f4bc ICL11
Change-Id: Icaeb0485cca6a5d1862c27df62fa29c9780dfa1d
2011-10-11 06:37:24 -07:00
The Android Open Source Project 2b2bf3985e Reconcile with ics-factoryrom-release
Change-Id: I0a35a81c49649458f8c02b093a8638539c65049d
2011-10-11 04:29:21 -07:00
The Android Automerger 7542db075d IFL10 2011-10-10 20:40:43 -07:00
The Android Automerger 12e856238b merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-10-10 20:37:22 -07:00
Ying Wang 486be82198 Enforce no nonexistent modules in PRODUCT_PACKAGES for sdk builds
Bug: 5430740
- Remove nonexistent names in PRODUCT_PACKAGES.
- Push down bluetooth-health, hostapd and wpa_supplicant.conf to
generic_no_telephony.mk and large_emu_hw.mk because they are not needed
by sdk builds.
- Remove core.mk from generic_armv5.mk and generic_x86.mk because they
  already inherit from generic.mk.

Change-Id: Ie44b95f1cae7ed0d4cf827ffce6a91d41902434d
2011-10-10 13:10:13 -07:00
Ying Wang 32ef58e2c1 Remove PRODUCT_CONTRIBUTORS_FILE which is no longer in use.
Bug: 5433204
Change-Id: Id88c21f8d1991d8cbcc5bb7dae784aa72dc4becf
2011-10-10 09:54:47 -07:00
The Android Open Source Project 2df17b4588 Reconcile with ics-factoryrom-release
Change-Id: Ibd9094406b6984d8a27179eb934edc05d3a43321
2011-10-10 07:27:25 -07:00
The Android Automerger 629bd7609f IFL09 2011-10-09 13:31:47 -07:00
The Android Automerger 04cbd261c8 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-10-09 13:28:28 -07:00
The Android Automerger 633d87b11e IFL07B 2011-10-07 22:23:44 -07:00
The Android Automerger 94ea143ff8 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-10-07 22:22:43 -07:00
The Android Open Source Project 226a54f03c Reconcile with ics-factoryrom-release
Change-Id: I5b9b2250b49befd6afd87ed426c4883e006bf292
2011-10-07 19:06:12 -07:00
The Android Automerger a281bd74ce IFL07 2011-10-07 18:15:16 -07:00
The Android Automerger 358156e360 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-10-07 18:12:00 -07:00
The Android Open Source Project b606492a80 Reconcile with honeycomb-LTE-release ics-factoryrom-release
Change-Id: I1a4e39e9520e2574fa8e4cdcf37c4c05a0017895
2011-10-07 05:35:30 -07:00
The Android Automerger 9f9e01a348 IFL06C 2011-10-06 22:44:00 -07:00
The Android Automerger fb5bc0512e merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-10-06 22:43:40 -07:00
The Android Automerger 774ad9a53a IFL06B 2011-10-06 20:54:42 -07:00
The Android Automerger 5fa69c59b2 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-10-06 20:51:13 -07:00
The Android Automerger 372e22998f HLK75D 2011-10-06 17:18:08 -07:00
The Android Open Source Project a570bde9f8 Reconcile with ics-factoryrom-release
Change-Id: I6bcfc3069e62fe077704a9454abdd33e364cc637
2011-10-06 07:45:19 -07:00
The Android Automerger ddda446a6f IFL06 2011-10-06 07:28:47 -07:00
The Android Automerger 32604d4fd8 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-10-06 07:21:34 -07:00
The Android Open Source Project 42c37ba412 Reconcile with ics-factoryrom-release
Change-Id: I7c2f0791fec871bd499afc9eaa41fd1dc55b91c5
2011-10-06 05:44:04 -07:00
The Android Automerger 3764a19091 IFL05C 2011-10-05 19:00:34 -07:00
The Android Automerger 75abbfd23c merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-10-05 18:58:14 -07:00
The Android Open Source Project 6fb71648db Reconcile with ics-factoryrom-release
Change-Id: Ic9d7efb8cb6228820010bb55973cef63b93b8e65
2011-10-05 16:15:57 -07:00