The Android Automerger
d0fbbd3446
JFN47C take 3
2012-05-18 12:32:30 -07:00
The Android Automerger
3000844e84
JFN47C
2012-05-18 12:31:42 -07:00
The Android Automerger
43d0d65698
JFN47C take 2
2012-05-18 12:16:59 -07:00
The Android Automerger
7bd7c9b11e
JFN47C
2012-05-18 11:37:02 -07:00
The Android Automerger
137f01598b
JFN48
2012-05-18 10:54:03 -07:00
The Android Automerger
559ba0ad18
merge in nakasi-factoryrom-release history after reset to jb-dev
2012-05-18 10:45:30 -07:00
The Android Automerger
783908cbae
JRN47C
2012-05-17 15:51:47 -07:00
The Android Automerger
159b9d4d26
JRN47B
2012-05-17 15:05:00 -07:00
The Android Automerger
81b2eb3e3e
JRN47
2012-05-17 09:27:59 -07:00
The Android Automerger
0154779948
merge in jb-release history after reset to jb-dev
2012-05-17 09:25:37 -07:00
The Android Automerger
167cbb0d32
force version reset
2012-05-17 09:25:00 -07:00
The Android Automerger
6631b2941b
JRN47
2012-05-17 07:11:04 -07:00
The Android Automerger
3efaeffcf8
merge in jb-release history after reset to jb-dev
2012-05-17 06:59:25 -07:00
The Android Automerger
8246871768
JRN46D
2012-05-16 16:50:44 -07:00
The Android Automerger
4ab2f9ce86
JRN46C
2012-05-16 15:52:26 -07:00
The Android Automerger
838ebb2e94
JRN46B
2012-05-16 12:47:02 -07:00
The Android Automerger
9a0e2f8673
JFN46
2012-05-16 07:56:08 -07:00
The Android Automerger
64019fbafa
merge in nakasi-factoryrom-release history after reset to jb-dev
2012-05-16 07:42:57 -07:00
The Android Automerger
ad13a75a5d
JRN46
2012-05-16 07:10:44 -07:00
The Android Automerger
09343f4fc4
merge in jb-release history after reset to jb-dev
2012-05-16 06:59:25 -07:00
James Dong
4007faf4c6
Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
...
related-to-bug: 6502980
Change-Id: I02a735ff4897ed386fe9c5d886260b1363a1e019
2012-05-16 01:17:42 -07:00
The Android Automerger
129c58f44b
JRN45B
2012-05-15 15:51:10 -07:00
Ying Wang
f446039efb
Merge "Don't set or reference LOCAL_MODULE_PATH for uninstallable modules." into jb-dev
2012-05-15 15:16:33 -07:00
James Dong
c8bfb1cad1
Revert "Remove dependency of libvideoeditor_jni.so on static libs from video editor engine"
...
Fixed the broken build first.
This reverts commit e85f05be14
2012-05-15 14:47:37 -07:00
Ying Wang
6e371e426f
Don't set or reference LOCAL_MODULE_PATH for uninstallable modules.
...
Change-Id: I98ab2f6c0d49a87aaeeba29fdf676277e4e65592
2012-05-15 14:31:26 -07:00
The Android Automerger
79154b1425
JFN45
2012-05-15 09:38:40 -07:00
The Android Automerger
fced96ebe2
merge in nakasi-factoryrom-release history after reset to jb-dev
2012-05-15 09:33:03 -07:00
The Android Automerger
95d04d0652
JRN45
2012-05-15 07:11:21 -07:00
The Android Automerger
535b6a6ae7
merge in jb-release history after reset to jb-dev
2012-05-15 06:59:25 -07:00
James Dong
e85f05be14
Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
...
related-to-bug: 6328360
Change-Id: Ia320d417497bc410f99f8ff7f11c727d1299afba
2012-05-15 00:45:45 -07:00
The Android Automerger
267de65815
JRN44C
2012-05-14 17:49:29 -07:00
The Android Automerger
5b2c7ae067
JRN44B
2012-05-14 15:57:17 -07:00
Ying Wang
3ceecfa3da
Check the well-formedness of an xml file before copying.
...
Bug: 6491991
Change-Id: I3dbf9a7e1fefd9fea2636c78a85bae63ea8391b8
2012-05-14 14:40:58 -07:00
The Android Automerger
fe61a0bc13
JRN44
2012-05-14 07:09:46 -07:00
The Android Automerger
5b791af4f9
merge in jb-release history after reset to jb-dev
2012-05-14 06:59:29 -07:00
The Android Automerger
917fc02fb6
JRN40I
2012-05-12 14:36:59 -07:00
The Android Automerger
b705c02fe9
JRN40H take three
2012-05-11 21:30:39 -07:00
The Android Automerger
32f243670a
JRN40H take two
2012-05-11 18:03:22 -07:00
Victoria Lease
67095e005c
Merge "Parse external/cibu-fonts/fonts.mk." into jb-dev
2012-05-11 16:51:47 -07:00
The Android Automerger
99956ed9d8
JRN40H
2012-05-11 16:29:04 -07:00
The Android Automerger
3dbf4c94aa
JRN40G
2012-05-11 16:04:09 -07:00
The Android Automerger
e2bcb9e516
JRN40F
2012-05-11 12:30:28 -07:00
The Android Automerger
17f197fcbf
JRN41
2012-05-11 11:41:47 -07:00
Doug Zongker
7bb042317a
add copy of public cert used for signing to OTA packages
...
When signing a file with -w (ie, an OTA package), add the file
META-INF/com/android/otacert, which is a copy of the public key
certificate. While this can be extracted from the CERT.RSA file,
having a copy of it more easily accessible makes it easier to write
tools.
Bug: 6477365
Change-Id: I8cdb19536eca9a223c2b954e3f8ea0d9f3f86f02
2012-05-11 09:22:29 -07:00
Dianne Hackborn
3742983d3b
JellyBean is now 4.1.
...
Change-Id: Ibf2d17e704a01d648e6c9fef774e9806e5e97b9f
2012-05-10 18:57:22 -07:00
The Android Automerger
a6862ca2fd
JRN40E
2012-05-10 18:09:44 -07:00
Ying Wang
a1ff6290e1
Now current is also a valid prebuilt SDK.
...
Change-Id: Id05d20f17a4b46e19df88516f50e58f6cdb62c1c
2012-05-10 18:07:33 -07:00
Ying Wang
0ec188f1c1
Support to build against prebuilt current SDK in unbundled branch
...
Bug: 6465084
With this change and prebuilt current SDK checked in, you can build
unbundled apps with LOCAL_SDK_VERSION current in an unbundled branch.
Change-Id: I4efcee611d08a3a903bd6bf5a80de11500564206
2012-05-10 17:40:49 -07:00
The Android Automerger
9e8f70ada3
JRN40D
2012-05-10 15:00:59 -07:00
The Android Automerger
b9c3d8a468
JRN40C
2012-05-10 12:27:23 -07:00
