Ying Wang
94539b152e
am 0fb728b6: am 28a18175: Don\'t use .. to reference the target file.
...
* commit '0fb728b65ab2199e0273af1217711aa46d6504c6':
Don't use .. to reference the target file.
2012-06-02 09:28:34 -07:00
Ying Wang
0fb728b65a
am 28a18175: Don\'t use .. to reference the target file.
...
* commit '28a181759079c34f8776f98f553e56554b527069':
Don't use .. to reference the target file.
2012-06-02 09:26:47 -07:00
Ying Wang
28a1817590
Don't use .. to reference the target file.
...
Change-Id: I1d08db81c37853f5bf0bdf5dbe848634e6ae9f61
2012-06-02 09:22:31 -07:00
Jean-Baptiste Queru
692e7904ce
am 89a0306e: am e7af5e24: Add Live Wallpapers to AOSP builds
...
* commit '89a0306ec3728bb8def4b78edaa87ba9eadc6d34':
Add Live Wallpapers to AOSP builds
2012-06-02 08:40:35 -07:00
Jean-Baptiste Queru
89a0306ec3
am e7af5e24: Add Live Wallpapers to AOSP builds
...
* commit 'e7af5e2428d6c831acb73fac6547c3a780dca729':
Add Live Wallpapers to AOSP builds
2012-06-02 08:35:03 -07:00
Jean-Baptiste Queru
e7af5e2428
Add Live Wallpapers to AOSP builds
...
Change-Id: I76df14d99fd876b765510ced8f5523e3bafce291
2012-06-01 18:27:03 -07:00
Wink Saville
93aec1fa33
am 84690f96: am f97105ea: Merge "Fix rild running in Nakasi." into jb-dev
...
* commit '84690f969e993ca712d028b9acfb0a7c17c08c44':
Fix rild running in Nakasi.
2012-05-31 13:27:55 -07:00
Wink Saville
84690f969e
am f97105ea: Merge "Fix rild running in Nakasi." into jb-dev
...
* commit 'f97105ea898fd4ad83ca55e391c0d512e3497b9b':
Fix rild running in Nakasi.
2012-05-31 13:25:41 -07:00
Wink Saville
f97105ea89
Merge "Fix rild running in Nakasi." into jb-dev
2012-05-31 13:21:34 -07:00
Wink Saville
689f117b63
Fix rild running in Nakasi.
...
The module rild is telephony specific, since Nakasi has no radio
it shouldn't run rild. Changing the build system so rild is optional
for products that don't have telephony support.
Since rild is now optional, it is necessary to add it explicitly to
the sdk build as the sdk build is special.
Bug: 6463864
Change-Id: If944e051023b567807585fb91163a1e3f79c1024
2012-05-31 10:35:52 -07:00
Keun young Park
49004e38fb
am 53ba6b22: am 15d15136: Merge "change location of apns-conf.xml and vold.conf" into jb-dev
...
* commit '53ba6b22f94c1192541b11ada001b68823b97efa':
change location of apns-conf.xml and vold.conf
2012-05-30 20:36:08 -07:00
Keun young Park
53ba6b22f9
am 15d15136: Merge "change location of apns-conf.xml and vold.conf" into jb-dev
...
* commit '15d151367482b6ed47cecf1a578b365b7c6ccab3':
change location of apns-conf.xml and vold.conf
2012-05-30 20:34:00 -07:00
Keun young Park
15d1513674
Merge "change location of apns-conf.xml and vold.conf" into jb-dev
2012-05-30 20:30:29 -07:00
Keun young Park
e581d866fb
change location of apns-conf.xml and vold.conf
...
- from development/data to device/generic/goldfish/data
Change-Id: Iab7ad32b31b64f854412dd3cf23fd244a5306ed9
2012-05-30 16:32:30 -07:00
Keun young Park
ca7d27212e
am dd8fe390: am 36e4e050: Merge "add add-to-product-copy-files-if-exists for pdk" into jb-dev
...
* commit 'dd8fe390ae9244398b41d23adfb42dbaa9804599':
add add-to-product-copy-files-if-exists for pdk
2012-05-30 16:16:20 -07:00
Keun young Park
dd8fe390ae
am 36e4e050: Merge "add add-to-product-copy-files-if-exists for pdk" into jb-dev
...
* commit '36e4e050ff52956fc4afe60c156e81c2016304c4':
add add-to-product-copy-files-if-exists for pdk
2012-05-30 16:13:43 -07:00
Keun young Park
36e4e050ff
Merge "add add-to-product-copy-files-if-exists for pdk" into jb-dev
2012-05-30 16:11:06 -07:00
Keun young Park
c41c5f4e46
add add-to-product-copy-files-if-exists for pdk
...
Change-Id: Ib35006824de81be31652bfff220bbe4e814869ce
2012-05-30 16:03:24 -07:00
Jeff Brown
645020913c
am 0e18fc47: am 01efddb0: Make make make faster.
...
* commit '0e18fc47b6181df7d354860095453475c7ecfca0':
Make make make faster.
2012-05-30 15:05:48 -07:00
Jeff Brown
0e18fc47b6
am 01efddb0: Make make make faster.
...
* commit '01efddb0b8c641a9ebfd955173dd58e015fbe903':
Make make make faster.
2012-05-30 15:02:56 -07:00
Jeff Brown
01efddb0b8
Make make make faster.
...
Optimize common case of uniq-words where the word is not
actually duplicated. Reduces make startup overhead.
Change-Id: I1bee13bbd08a7b01248f4452283a64a724663d02
2012-05-30 13:52:22 -07:00
The Android Open Source Project
80a935dfd1
am 2e0f19a3: Reconcile with jb-release nakasi-factoryrom-release
...
* commit '2e0f19a3fb0de035028717941044ec9e6a36c4a4':
JRN60
JRN59D
JRN59C
JFN53J
JRN59B
2012-05-30 10:14:35 -07:00
The Android Open Source Project
2e0f19a3fb
Reconcile with jb-release nakasi-factoryrom-release
...
Change-Id: Iaa4109b5db2d6b15e214c05554b586e5604d9692
2012-05-30 10:12:45 -07:00
The Android Automerger
1347ee6aff
JRN60
2012-05-30 07:10:33 -07:00
The Android Automerger
935f4ed555
merge in jb-release history after reset to jb-dev
2012-05-30 06:59:32 -07:00
The Android Automerger
70efb21cce
JRN59D
2012-05-29 21:53:55 -07:00
The Android Automerger
0dcdc13763
JRN59C
2012-05-29 19:48:47 -07:00
The Android Automerger
291644e258
JFN53J
2012-05-29 19:45:42 -07:00
Keun young Park
979bf12816
am 2e64f64c: am 3e93aeae: add platform.zip from platform-java to dist
...
* commit '2e64f64c9bc1cc8cbf0f59723b78a278dec66b3b':
add platform.zip from platform-java to dist
2012-05-29 18:32:33 -07:00
Keun young Park
2e64f64c9b
am 3e93aeae: add platform.zip from platform-java to dist
...
* commit '3e93aeae10aa70ab64e78fbab0bb8741d0b04d99':
add platform.zip from platform-java to dist
2012-05-29 18:28:00 -07:00
Keun young Park
3e93aeae10
add platform.zip from platform-java to dist
...
Change-Id: I08e110edf70ef5ec313ee02e03803fa152f0aa6a
2012-05-29 18:13:39 -07:00
The Android Automerger
d9a65fd160
JRN59B
2012-05-29 15:50:42 -07:00
Ying Wang
1dfdbc95d1
am a9b484ad: am 82eb7082: Fix typo.
...
* commit 'a9b484ad0ee562225282098b701fe3696ad04bec':
Fix typo.
2012-05-29 13:47:00 -07:00
Ying Wang
a9b484ad0e
am 82eb7082: Fix typo.
...
* commit '82eb7082aa9b7239770f1631211a3c18b6daacfe':
Fix typo.
2012-05-29 13:44:13 -07:00
Ying Wang
82eb7082aa
Fix typo.
...
Change-Id: Id4b619e3fff8d801c4662d9cb2719576c370a503
2012-05-29 13:42:18 -07:00
The Android Open Source Project
2da0e2fe5b
am 679b1c03: Reconcile with jb-release nakasi-factoryrom-release
...
* commit '679b1c031f144e64cb95797776955674563bc3de':
JRN59
JRN54F
JRN54E
JFN53I
JRN54D
JFN53H
JRN54C
JFN53G
JRN54B
JFN53F
JFN53E
2012-05-29 09:41:41 -07:00
The Android Open Source Project
679b1c031f
Reconcile with jb-release nakasi-factoryrom-release
...
Change-Id: I804144e79bf82b1d6d1f9e6dc9073249aad597f0
2012-05-29 09:39:20 -07:00
The Android Automerger
2e05f1ddf5
JRN59
2012-05-29 09:05:39 -07:00
The Android Automerger
a437192620
merge in jb-release history after reset to jb-dev
2012-05-29 08:54:56 -07:00
Ying Wang
9d50defb8b
Revert "Use Mac OS X SDK 10.6."
...
This reverts commit 4c1b310b9b
2012-05-25 18:55:52 -07:00
Ying Wang
4c1b310b9b
Use Mac OS X SDK 10.6.
...
Change-Id: Ie36914ab1763c5606111f7501c97ed97517e7187
2012-05-25 15:43:38 -07:00
The Android Automerger
f26c49d1c9
JRN54F
2012-05-25 15:31:30 -07:00
The Android Automerger
117bfe3695
JRN54E
2012-05-25 15:12:01 -07:00
The Android Automerger
5ccec8a0ab
JFN53I
2012-05-25 15:02:41 -07:00
Keun young Park
ebfe97a558
am f89cd668: am d8de82fb: ignore touch error happening from broken symbolic link
...
* commit 'f89cd6689c6d39303e61dca88d0f84f8c8fea662':
ignore touch error happening from broken symbolic link
2012-05-25 14:07:47 -07:00
Keun young Park
f89cd6689c
am d8de82fb: ignore touch error happening from broken symbolic link
...
* commit 'd8de82fbca4371ccefb41e02ac737e3a153901b3':
ignore touch error happening from broken symbolic link
2012-05-25 14:04:35 -07:00
Keun young Park
d8de82fbca
ignore touch error happening from broken symbolic link
...
- maguro platform.zip contains hdcp.keys symbolic link which is broken except env with the key
- this causes error in the touch
Bug: 6555557
Change-Id: I5f9ff5d57c87c0d3038545eeba3b553445a8493c
2012-05-25 12:22:22 -07:00
The Android Automerger
98d83b518e
JRN54D
2012-05-25 12:21:49 -07:00
The Android Automerger
cea11997a6
JFN53H
2012-05-25 11:25:04 -07:00
The Android Automerger
fc3b84a19a
JRN54C
2012-05-25 11:14:20 -07:00
