The Android Automerger
1651b376c2
merge in ics-mr0-release history after reset to ics-mr0
2011-10-21 23:21:56 -07:00
The Android Automerger
b8382e05ef
ICL21B
2011-10-21 17:04:05 -07:00
Chia-chi Yeh
e44a3e05f2
Merge "Move VpnDialogs into core.mk."
2011-10-21 16:45:29 -07:00
Chia-chi Yeh
c8d742a119
Move VpnDialogs into core.mk.
...
It is required by the APIs of user space VPN.
Bug: 5495078
Change-Id: I30c309c4f6467a35fca95e76f666799816874752
2011-10-21 16:40:17 -07:00
Chia-chi Yeh
a3d53ceba4
am 07767a9e: (-s ours) Move VpnDialogs into core.mk.
...
* commit '07767a9e748fdbdab2297974ad01cb265e7fb5a9':
Move VpnDialogs into core.mk.
2011-10-21 16:39:46 -07:00
Wink Saville
4427f4e812
Change BUILD_ID.
...
On master branch build id should be MASTER.
Change-Id: I7829b3933947730b298fca8a4e39de6a60b9caad
2011-10-21 16:31:55 -07:00
Chia-chi Yeh
07767a9e74
Move VpnDialogs into core.mk.
...
It is required by the APIs of user space VPN.
Also remove the dead VpnServices.
Bug: 5495078
Change-Id: I321b8da16898cd547ed79bea9c264b5e7bc781eb
2011-10-21 16:13:54 -07:00
The Android Automerger
9aa35b64e0
ICL21
2011-10-21 15:59:05 -07:00
The Android Automerger
b50c7ecf46
merge in ics-mr0-release history after reset to ics-mr0
2011-10-21 15:54:07 -07:00
Tor Norbye
4377cc701a
Build fix - include sdk/lint in build
...
Change-Id: Id65b7a3f72dd6c5104738fa872f3beb029d91163
2011-10-20 19:21:30 -07:00
The Android Automerger
0e1fca0789
IFL10F
2011-10-20 17:22:10 -07:00
The Android Automerger
fe22131556
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-10-20 17:18:53 -07:00
The Android Automerger
9348f36d35
ICL20C
2011-10-20 15:52:55 -07:00
The Android Automerger
5d0302a9e0
merge in ics-mr0-release history after reset to ics-mr0
2011-10-20 15:47:58 -07:00
The Android Automerger
533230766b
ICL20B
2011-10-20 12:38:01 -07:00
The Android Open Source Project
b4446245dd
Reconcile with ics-mr0-release
...
Change-Id: Id2ef87f3662a93f2cedbf1dcb7f0f33d9893637e
2011-10-20 09:17:01 -07:00
The Android Automerger
1cd4ac8ea1
ICL20
2011-10-20 06:32:58 -07:00
The Android Automerger
725bd9fc44
merge in ics-mr0-release history after reset to ics-mr0
2011-10-20 06:32:37 -07:00
The Android Automerger
7f28debb39
ICL19B
2011-10-19 19:03:39 -07:00
The Android Automerger
44833d64c9
merge in ics-mr0-release history after reset to ics-mr0
2011-10-19 18:59:30 -07:00
Scott Main
5b95337f53
am 51372cd2: docs: update "na" style to make opaque, add dropshadow, and re-order z-index to be on top of images
...
* commit '51372cd2e564f411ad80821c7adad210bea7d8b7':
docs: update "na" style to make opaque, add dropshadow, and re-order z-index to be on top of images
2011-10-19 16:29:36 -07:00
Scott Main
51372cd2e5
docs: update "na" style to make opaque, add dropshadow, and re-order
...
z-index to be on top of images
Change-Id: I7c0c2e15d511f4362eb721bf8eb0343fa3f24bc0
2011-10-19 16:09:26 -07:00
The Android Open Source Project
1a587c6c0c
Reconcile with ics-mr0-release
...
Change-Id: Icde55521aef897a6473868d9d8fd0413a4dfd255
2011-10-19 07:22:54 -07:00
The Android Automerger
ab247de8f4
ICL19
2011-10-19 06:30:18 -07:00
The Android Automerger
e7460e2432
merge in ics-mr0-release history after reset to ics-mr0
2011-10-19 06:27:09 -07:00
The Android Automerger
959e0f5e57
ICL18B
2011-10-18 17:00:01 -07:00
The Android Automerger
b52a12626c
merge in ics-mr0-release history after reset to ics-mr0
2011-10-18 16:53:28 -07:00
Bjorn Bringert
cec077521e
Merge "Compile each proto file separately"
2011-10-18 09:48:20 -07:00
Bjorn Bringert
20f5efd82c
Compile each proto file separately
...
Before, if a module had several proto source files,
they would all be compiled in a single invocation
of aprotoc. If any of the files imported one of the
other files, you got an aprotoc error about duplicates.
And if you removed the files that were imported
from the list of source files, no Java code
would be generated for the imported files,
causing a Java compile time error.
This changes compiles each proto file separately, which
avoids both of the problems above. It's slightly more
inefficient, but aprotoc is really fast.
Change-Id: I7bd8092ec2953c20269367a1c68ff84acceea3be
2011-10-18 16:08:27 +01:00
The Android Open Source Project
b5bd0a1bc6
Reconcile with ics-mr0-release
...
Change-Id: I595da4205a7c60207644b445af0491a9aef5a9d3
2011-10-18 07:31:50 -07:00
The Android Automerger
eab7f20d1e
ICL18
2011-10-18 06:28:36 -07:00
The Android Automerger
95db4d8808
merge in ics-mr0-release history after reset to ics-mr0
2011-10-18 06:27:14 -07:00
The Android Automerger
db90d724ec
ICL17B
2011-10-17 20:11:30 -07:00
The Android Automerger
be8b913141
merge in ics-mr0-release history after reset to ics-mr0
2011-10-17 20:07:27 -07:00
Ying Wang
67d6305c5c
am 55370202: Remvoe whisperd from user_tags.mk.
...
* commit '5537020242a499e54c351ced962fe437ae1fc4d2':
Remvoe whisperd from user_tags.mk.
2011-10-17 20:06:51 -07:00
Ying Wang
5537020242
Remvoe whisperd from user_tags.mk.
...
Change-Id: Ib271c568a6e6907d033040dbe6c3574124fbe469
Bug: 5473754
2011-10-17 17:59:44 -07:00
Maarten Hooft
b18d4069ff
am 068bf1a6: Merge " Added Hindi to the list of languages to build under the full target." into ics-mr0
...
* commit '068bf1a601d94f9ce8ee9fe9a9fc125e36a7fd02':
Added Hindi to the list of languages to build under the full target.
2011-10-17 17:38:39 -07:00
Maarten Hooft
068bf1a601
Merge " Added Hindi to the list of languages to build under the full target." into ics-mr0
2011-10-17 17:37:00 -07:00
Maarten Hooft
e8985fc022
Added Hindi to the list of languages to build under the full target.
...
Change-Id: I57201097e5ba1337249dde8b6efe704d75bf05b3
2011-10-17 13:40:24 -07:00
The Android Open Source Project
e8af158200
Reconcile with ics-factoryrom-release ics-mr0-release
...
Change-Id: I924918872b02de185bee53d0516fc34b9d3b3f28
2011-10-17 12:19:56 -07:00
Dianne Hackborn
9baabf8d7e
am a0f464a8: New PRODUCT_AAPT_PREF_CONFIG.
...
* commit 'a0f464a8e7f006177db084df7e925bbb8e5ffed3':
New PRODUCT_AAPT_PREF_CONFIG.
2011-10-17 11:31:38 -07:00
The Android Automerger
3ab18dbdea
ICL17
2011-10-17 06:28:18 -07:00
The Android Automerger
f353780a71
merge in ics-mr0-release history after reset to ics-mr0
2011-10-17 06:27:08 -07:00
The Android Automerger
33fd22ec17
ICL16B
2011-10-16 16:52:55 -07:00
The Android Automerger
8906500709
merge in ics-mr0-release history after reset to ics-mr0
2011-10-16 16:51:16 -07:00
The Android Automerger
881b3db359
ICL16
2011-10-16 06:28:44 -07:00
The Android Automerger
450ab4ba96
merge in ics-mr0-release history after reset to ics-mr0
2011-10-16 06:27:25 -07:00
The Android Automerger
b45d204b1e
IFL10E
2011-10-15 12:51:47 -07:00
The Android Automerger
d58a15337a
ICL14
2011-10-14 21:59:59 -07:00
The Android Automerger
28b3801102
merge in ics-mr0-release history after reset to ics-mr0
2011-10-14 21:55:44 -07:00
