OSDN Git Service
Doug Zongker [Mon, 19 Sep 2011 22:02:03 +0000 (15:02 -0700)]
build the sqlite3 binary for use by the OTA tools
Change-Id: I2c6cc02dec74fdcedd3e2a6f3ddb1dfba657a883
The Android Automerger [Wed, 21 Sep 2011 04:18:52 +0000 (21:18 -0700)]
HLK75B
The Android Automerger [Wed, 14 Sep 2011 01:28:39 +0000 (18:28 -0700)]
HLK75
The Android Automerger [Mon, 12 Sep 2011 16:58:42 +0000 (09:58 -0700)]
HLK73B
The Android Automerger [Sun, 11 Sep 2011 23:46:55 +0000 (16:46 -0700)]
HLK73
The Android Automerger [Fri, 9 Sep 2011 20:04:43 +0000 (13:04 -0700)]
HLK71
The Android Automerger [Tue, 6 Sep 2011 21:13:39 +0000 (14:13 -0700)]
HLK42E
The Android Automerger [Fri, 2 Sep 2011 16:28:28 +0000 (09:28 -0700)]
HLK42D
The Android Automerger [Tue, 30 Aug 2011 18:07:24 +0000 (11:07 -0700)]
HLK42C
Wink Saville [Wed, 17 Aug 2011 17:03:51 +0000 (10:03 -0700)]
DO NOT MERGE: Update hc-LTE PLATFORM_VERSION from 3.2 to 3.2.2.
Change-Id: Ib30bf10669119b588c691e4cebdc8093f402e3e4
The Android Automerger [Wed, 17 Aug 2011 18:42:41 +0000 (11:42 -0700)]
HLK42B
The Android Automerger [Thu, 11 Aug 2011 21:33:43 +0000 (14:33 -0700)]
HLK42
The Android Automerger [Thu, 11 Aug 2011 21:33:13 +0000 (14:33 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Fri, 5 Aug 2011 22:04:39 +0000 (15:04 -0700)]
HLK36B
The Android Automerger [Fri, 5 Aug 2011 22:04:08 +0000 (15:04 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Fri, 5 Aug 2011 14:03:48 +0000 (07:03 -0700)]
HLK36
The Android Automerger [Fri, 5 Aug 2011 14:03:07 +0000 (07:03 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Thu, 4 Aug 2011 14:03:40 +0000 (07:03 -0700)]
HLK35
The Android Automerger [Thu, 4 Aug 2011 14:03:17 +0000 (07:03 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Wed, 3 Aug 2011 14:03:26 +0000 (07:03 -0700)]
HLK34
The Android Automerger [Wed, 3 Aug 2011 14:03:07 +0000 (07:03 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Tue, 2 Aug 2011 23:24:03 +0000 (16:24 -0700)]
HLK33C
The Android Automerger [Tue, 2 Aug 2011 23:23:31 +0000 (16:23 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Tue, 2 Aug 2011 16:37:27 +0000 (09:37 -0700)]
HLK33B
The Android Automerger [Tue, 2 Aug 2011 16:37:18 +0000 (09:37 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Tue, 2 Aug 2011 14:07:14 +0000 (07:07 -0700)]
HLK33
The Android Automerger [Tue, 2 Aug 2011 14:06:50 +0000 (07:06 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Mon, 1 Aug 2011 14:05:55 +0000 (07:05 -0700)]
HLK32
The Android Automerger [Mon, 1 Aug 2011 14:05:41 +0000 (07:05 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Fri, 29 Jul 2011 23:54:19 +0000 (16:54 -0700)]
HLK28C
Change-Id: I95a479237f5e1f98fab050321e18acec2fd9e495
Ying Wang [Fri, 29 Jul 2011 20:32:11 +0000 (13:32 -0700)]
Add iptables and ip6tables to core.mk.
Change-Id: I1cb2be8a28013b20d1032a8d766021a2f4aca9e1
The Android Automerger [Fri, 29 Jul 2011 23:39:57 +0000 (16:39 -0700)]
HLK28B
Change-Id: Icaf880edd34a856aea8578f44de09de710ca29af
The Android Automerger [Fri, 29 Jul 2011 23:36:54 +0000 (16:36 -0700)]
HLK29B
Change-Id: I7bb412b23b8bcd4850b1c4a9db8b8e3943d100a9
The Android Automerger [Fri, 29 Jul 2011 23:36:50 +0000 (16:36 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
Ying Wang [Fri, 29 Jul 2011 20:32:11 +0000 (13:32 -0700)]
Add iptables and ip6tables to core.mk.
Change-Id: I1cb2be8a28013b20d1032a8d766021a2f4aca9e1
The Android Automerger [Fri, 29 Jul 2011 14:20:23 +0000 (07:20 -0700)]
HLK29
Change-Id: Iff165f81fde7af292c4763cc24c95dbc796548ab
The Android Automerger [Fri, 29 Jul 2011 14:20:16 +0000 (07:20 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Thu, 28 Jul 2011 14:25:07 +0000 (07:25 -0700)]
HLK28
Change-Id: I433b7584e4facbfa28699bb489d3afc6c6a28251
The Android Automerger [Thu, 28 Jul 2011 14:25:00 +0000 (07:25 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Wed, 27 Jul 2011 14:20:03 +0000 (07:20 -0700)]
HLK27
Change-Id: I56c92e1d76325f9e2d445ef732028f30cb421931
The Android Automerger [Wed, 27 Jul 2011 14:19:59 +0000 (07:19 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Tue, 26 Jul 2011 14:21:44 +0000 (07:21 -0700)]
HLK26
Change-Id: I369306a7ce84013f36bfddb6b234aa5cdbe8c6b2
The Android Automerger [Tue, 26 Jul 2011 14:21:39 +0000 (07:21 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Mon, 25 Jul 2011 14:20:28 +0000 (07:20 -0700)]
HLK25
Change-Id: I9e5a0007de7806b0d49554f3a67f72d84adae42a
The Android Automerger [Mon, 25 Jul 2011 14:20:21 +0000 (07:20 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Fri, 22 Jul 2011 21:22:00 +0000 (14:22 -0700)]
HLK22B
Change-Id: I70e7afdd9950937d1229ec54e14aed34e31d36a4
The Android Automerger [Fri, 22 Jul 2011 21:21:56 +0000 (14:21 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Fri, 22 Jul 2011 16:40:35 +0000 (09:40 -0700)]
HLK22
Change-Id: I94e1ed33ee90f23d21f8e0fe6f8024eb2254241f
The Android Automerger [Fri, 22 Jul 2011 16:40:24 +0000 (09:40 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Thu, 21 Jul 2011 14:21:29 +0000 (07:21 -0700)]
HLK21
Change-Id: Iabe6d5dfff4f1eca685b09c87bf1f38865f0167c
The Android Automerger [Thu, 21 Jul 2011 14:21:25 +0000 (07:21 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Wed, 20 Jul 2011 14:21:04 +0000 (07:21 -0700)]
HLK20
Change-Id: Id5e729d4e16fd4a3f8ab91e490d1034d299606c6
The Android Automerger [Wed, 20 Jul 2011 14:20:56 +0000 (07:20 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Tue, 19 Jul 2011 14:16:12 +0000 (07:16 -0700)]
HLK19
Change-Id: I003e95a859cb73fad40d6069aa5521f34660a927
The Android Automerger [Tue, 19 Jul 2011 14:16:04 +0000 (07:16 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Mon, 18 Jul 2011 23:03:14 +0000 (16:03 -0700)]
HLK18B
Change-Id: Id19ef186c942370c8ddf9c2e0bdfa5651469fbb5
The Android Automerger [Mon, 18 Jul 2011 23:03:08 +0000 (16:03 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Mon, 18 Jul 2011 14:25:51 +0000 (07:25 -0700)]
HLK18
Change-Id: Ib9de1e5c3155d1a712015611e8839afcd4848aca
The Android Automerger [Mon, 18 Jul 2011 14:25:47 +0000 (07:25 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Fri, 15 Jul 2011 17:45:25 +0000 (10:45 -0700)]
HLK15B
Change-Id: Ia0e0315a0f2917aa53329625d39b54e40ab9c239
The Android Automerger [Fri, 15 Jul 2011 17:45:20 +0000 (10:45 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Fri, 15 Jul 2011 14:19:48 +0000 (07:19 -0700)]
HLK15
Change-Id: I4fe9536484604add3126a99539991e6d3c45f435
The Android Automerger [Fri, 15 Jul 2011 14:19:44 +0000 (07:19 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Thu, 14 Jul 2011 14:20:34 +0000 (07:20 -0700)]
HLK14
Change-Id: I66abf43ce1ae0af8d08014cb5dabfddfe28f8010
The Android Automerger [Thu, 14 Jul 2011 14:20:29 +0000 (07:20 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Wed, 13 Jul 2011 15:13:33 +0000 (08:13 -0700)]
HLK13
Change-Id: Ib4deb6215877d777476341cd8a21f26a74294acd
The Android Automerger [Wed, 13 Jul 2011 15:13:29 +0000 (08:13 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Tue, 12 Jul 2011 14:19:42 +0000 (07:19 -0700)]
HLK12
Change-Id: Ifc271bd0b913715c28ce8813c1f1d306d71f819f
The Android Automerger [Tue, 12 Jul 2011 14:19:35 +0000 (07:19 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Mon, 11 Jul 2011 14:21:08 +0000 (07:21 -0700)]
HLK11
Change-Id: I0b2c58dcfde3f50f0ec06e42a114b6b431b347d3
The Android Automerger [Mon, 11 Jul 2011 14:21:01 +0000 (07:21 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
Scott Main [Sat, 9 Jul 2011 00:44:08 +0000 (17:44 -0700)]
am
1e03253b: Merge "docs: fix xss vulnerability bug
5008593" into honeycomb-mr2
* commit '
1e03253bf263472ea0028d2518292beaf4cbe01a':
docs: fix xss vulnerability bug
5008593
Scott Main [Sat, 9 Jul 2011 00:42:40 +0000 (17:42 -0700)]
Merge "docs: fix xss vulnerability bug
5008593" into honeycomb-mr2
Scott Main [Fri, 8 Jul 2011 23:19:25 +0000 (16:19 -0700)]
docs: fix xss vulnerability
bug
5008593
the fix deletes some code that was originally there to handle side nav
highlighting for inter-doc links. This code is no longer necessary (or at least
should not be) because side nav links should not be inter-doc links, but
should always be to their own document (no two sidenav links should go
to separate sections of the same doc).
Change-Id: If77d6fe869e6a44bae2f194c9de26222e6ad9419
Joe Malin [Fri, 8 Jul 2011 16:29:29 +0000 (09:29 -0700)]
am
8cf99f0c: DOC CHANGE: Change GTV icons for home page
* commit '
8cf99f0ccee8ecc95183f939d633a514e7eebdfb':
DOC CHANGE: Change GTV icons for home page
The Android Automerger [Fri, 8 Jul 2011 14:20:51 +0000 (07:20 -0700)]
HLK08
Change-Id: I1fdedea62d41405b4e16139c60c2f54ae0db45e5
The Android Automerger [Fri, 8 Jul 2011 14:20:45 +0000 (07:20 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Thu, 7 Jul 2011 14:19:53 +0000 (07:19 -0700)]
HLK07
Change-Id: I9442d2198c19df9fadfcb19868cde304c4088444
The Android Automerger [Thu, 7 Jul 2011 14:19:47 +0000 (07:19 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
Joe Malin [Fri, 1 Jul 2011 19:51:48 +0000 (12:51 -0700)]
DOC CHANGE: Change GTV icons for home page
Change-Id: If7172345173b165350417ab52f706d6444dc4d96
The Android Automerger [Wed, 6 Jul 2011 14:13:59 +0000 (07:13 -0700)]
HLK06
Change-Id: Id9a931f0e2f1e9d11ee40335c19890206541279a
The Android Automerger [Wed, 6 Jul 2011 14:13:54 +0000 (07:13 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Tue, 5 Jul 2011 14:15:28 +0000 (07:15 -0700)]
HLK05
Change-Id: I4c789558d8e510bf250ca5ccbfce292dc39dbd5a
The Android Automerger [Tue, 5 Jul 2011 14:15:24 +0000 (07:15 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Mon, 4 Jul 2011 14:18:52 +0000 (07:18 -0700)]
HLK04
Change-Id: Ib862c2fb576f0ce3becb00a576db2566ec319823
The Android Automerger [Mon, 4 Jul 2011 14:18:47 +0000 (07:18 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Fri, 1 Jul 2011 22:37:50 +0000 (15:37 -0700)]
HLK01B
Change-Id: I94bde12eeace63caa24bc545d97e8af49a7d53e5
The Android Automerger [Fri, 1 Jul 2011 22:37:44 +0000 (15:37 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Fri, 1 Jul 2011 14:19:24 +0000 (07:19 -0700)]
HLK01
Change-Id: I3c25b979402a5843c5bcba58336dc0d9a805503c
The Android Automerger [Fri, 1 Jul 2011 14:19:18 +0000 (07:19 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Thu, 30 Jun 2011 14:19:12 +0000 (07:19 -0700)]
HLJ91
Change-Id: Ib4ae3dd4de51cbc0f736e5db90670bbea9264b7e
The Android Automerger [Thu, 30 Jun 2011 14:19:06 +0000 (07:19 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Wed, 29 Jun 2011 14:18:20 +0000 (07:18 -0700)]
HLJ90
Change-Id: Ic5c6aa3728e51af7fce0ca2d8afcf79bc17dfd80
The Android Automerger [Wed, 29 Jun 2011 14:18:16 +0000 (07:18 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Tue, 28 Jun 2011 22:11:24 +0000 (15:11 -0700)]
HLJ89B
Change-Id: I5c5c7e0355a70123aa3a598bf33055b9fdc75cc5
The Android Automerger [Tue, 28 Jun 2011 22:11:20 +0000 (15:11 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Tue, 28 Jun 2011 14:19:46 +0000 (07:19 -0700)]
HLJ89
Change-Id: I2566542dd48247e7010606b4ba0d6edab81e6c67
The Android Automerger [Tue, 28 Jun 2011 14:19:38 +0000 (07:19 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Mon, 27 Jun 2011 15:17:16 +0000 (08:17 -0700)]
HLJ88
Change-Id: I886289d92b6850bd83c86cd48e182025ab137a0c
The Android Automerger [Mon, 27 Jun 2011 15:17:08 +0000 (08:17 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE