Commit graph

6326 commits

Author SHA1 Message Date
The Android Open Source Project
b5bd482fc4 Reconcile with gingerbread-release gingerbread-mr4-release honeycomb-LTE-release
Change-Id: I7fac76d938aaa591a908b7a5b7cc5b5d31b79efe
2011-08-04 18:45:50 -07:00
The Android Automerger
b51a7b4462 HLK35 2011-08-04 07:03:40 -07:00
The Android Automerger
e0fe8f81c7 merge in honeycomb-LTE-release history after reset to honeycomb-LTE 2011-08-04 07:03:17 -07:00
Jean-Baptiste Queru
b8223caf03 am c55ebf23: am 8dd289d3: Ignore from gingerbread
* commit 'c55ebf232e1c0287ef841a5d917cb12feefba2d6':
  Updating version to 2.3.7 to reflect some patches.
  Bumping version to 2.3.6 to reflect a few patches.
2011-08-03 17:42:16 -07:00
The Android Automerger
21c70388af HLK34 2011-08-03 07:03:26 -07:00
The Android Automerger
46021d319c merge in honeycomb-LTE-release history after reset to honeycomb-LTE 2011-08-03 07:03:07 -07:00
Chih-Wei Huang
aa1c321a58 x86: remove obsolete comments
Change-Id: Ifb12892c17a50f85c7700d6413ea295a4dad7047
2011-08-03 12:16:59 +08:00
Jean-Baptiste Queru
c55ebf232e am 8dd289d3: Ignore from gingerbread
* commit '8dd289d399e76f90e24383a7ffed4b667db6cbb3':
  Updating version to 2.3.7 to reflect some patches.
  Bumping version to 2.3.6 to reflect a few patches.
2011-08-02 17:09:58 -07:00
Jean-Baptiste Queru
8dd289d399 Ignore from gingerbread
We like our AOSP version numbers unchanged and a bit nutty.

Change-Id: Iddfd494bc52f13bdeb90f39393d89f554e2cfb64
2011-08-02 17:04:57 -07:00
The Android Automerger
6ac5b3f673 GWK15F
Change-Id: If34f003efe36006666e68ab39313772257ea1b45
2011-08-02 16:56:15 -07:00
Dan Morrill
91a7338665 Updating version to 2.3.7 to reflect some patches.
Change-Id: I6118b41a26a1ea6940758313871eb8ab83ab06a2
2011-08-02 16:55:55 -07:00
The Android Automerger
f2a88678dd Merge remote branch 'goog/gingerbread-release' into gingerbread-mr4-release
Conflicts:
	core/build_id.mk

Change-Id: If3af1b8a02be0eff4373ff62469ccee820ffeb6a
2011-08-02 16:52:03 -07:00
Dan Morrill
6d0f51b44b Updating version to 2.3.7 to reflect some patches.
Change-Id: I6118b41a26a1ea6940758313871eb8ab83ab06a2
2011-08-02 16:46:38 -07:00
The Android Automerger
db0dafb897 HLK33C 2011-08-02 16:24:03 -07:00
The Android Automerger
7ea441c0bb merge in honeycomb-LTE-release history after reset to honeycomb-LTE 2011-08-02 16:23:31 -07:00
Dan Morrill
e5796382cc Bumping version to 2.3.6 to reflect a few patches.
Change-Id: I540a3954c70502e3deac151c642d454c87a3821b
2011-08-02 16:22:30 -07:00
android-merger
92e160168b GRJ90B
Change-Id: I8da7004b84d8f3df0fee126b178d8bcbcb7b6eb1
2011-08-02 16:07:09 -07:00
Dan Morrill
b3eae868dd Bumping version to 2.3.6 to reflect a few patches.
Change-Id: I540a3954c70502e3deac151c642d454c87a3821b
2011-08-02 15:36:05 -07:00
The Android Open Source Project
a5dafedd03 Reconcile with honeycomb-LTE-release
Change-Id: I98bfcba4046382292383ce333ab521b1ab583ce1
2011-08-02 09:52:34 -07:00
The Android Automerger
4bea51b049 HLK33B 2011-08-02 09:37:27 -07:00
The Android Automerger
edcd9fd917 merge in honeycomb-LTE-release history after reset to honeycomb-LTE 2011-08-02 09:37:18 -07:00
The Android Open Source Project
110378b03e Reconcile with honeycomb-LTE-release
Change-Id: I0665c9e635f6260b3de3590f553c163d6732bb01
2011-08-02 07:33:41 -07:00
The Android Automerger
5b68e56b0c HLK33 2011-08-02 07:07:14 -07:00
The Android Automerger
59bd7e455a merge in honeycomb-LTE-release history after reset to honeycomb-LTE 2011-08-02 07:06:50 -07:00
David Hu
cbfec35cbf GPS Location Test Build Change
Build GpsLocationTest.apk as part of the sdk build

Change-Id: I4a8fff9fa952e127c39a8e8e3857e8f05b8912be
2011-08-01 19:27:28 -07:00
The Android Open Source Project
e692c7d97b Reconcile with honeycomb-LTE-release
Change-Id: I1d877334c673a600d5f31abe8c2764635dcd98f2
2011-08-01 07:22:35 -07:00
The Android Automerger
f90740935e HLK32 2011-08-01 07:05:55 -07:00
The Android Automerger
b358231e11 merge in honeycomb-LTE-release history after reset to honeycomb-LTE 2011-08-01 07:05:41 -07:00
The Android Open Source Project
98abe84d33 Reconcile with honeycomb-LTE-release
Change-Id: I2e9258d81a5a89d8d07af36c70c3bb2463bde3b4
2011-07-30 13:12:16 -07:00
The Android Automerger
5962ac477f HLK28C
Change-Id: I95a479237f5e1f98fab050321e18acec2fd9e495
2011-07-29 16:54:19 -07:00
Ying Wang
e3996f4d2c Add iptables and ip6tables to core.mk.
Change-Id: I1cb2be8a28013b20d1032a8d766021a2f4aca9e1
2011-07-29 16:40:03 -07:00
The Android Automerger
9e93005515 HLK28B
Change-Id: Icaf880edd34a856aea8578f44de09de710ca29af
2011-07-29 16:39:57 -07:00
The Android Automerger
15122d1ebc HLK29B
Change-Id: I7bb412b23b8bcd4850b1c4a9db8b8e3943d100a9
2011-07-29 16:36:54 -07:00
The Android Automerger
c28c8305cc merge in honeycomb-LTE-release history after reset to honeycomb-LTE 2011-07-29 16:36:50 -07:00
The Android Open Source Project
762fdb63e2 Reconcile with gingerbread-mr4-release honeycomb-LTE-release
Change-Id: Ia001a7364a761781ce15e61db6988a1961cb2bff
2011-07-29 16:19:42 -07:00
Scott Main
3d71f23e61 Merge "docs: update api filtering to support provisional APIs (api levels that are string names)" 2011-07-29 15:10:03 -07:00
Raphael Moll
b194b9d185 am dd9e8477: am 266a571f: am dceb4655: Merge "Add sdk/assetstudio to the Windows build paths."
* commit 'dd9e8477e6cc1a8de556dd7942fb81c049e2e373':
  Add sdk/assetstudio to the Windows build paths.
2011-07-29 14:34:01 -07:00
Ying Wang
603755d6ce resolved conflicts for merge of 9b5447df to master
Change-Id: I1fe490a9e0bf01321c845ab0150fead06c16d68b
2011-07-29 14:25:59 -07:00
Raphael Moll
dd9e8477e6 am 266a571f: am dceb4655: Merge "Add sdk/assetstudio to the Windows build paths."
* commit '266a571fbd557c402e937130922ced8c523dd451':
  Add sdk/assetstudio to the Windows build paths.
2011-07-29 13:59:23 -07:00
Ying Wang
9b5447df85 am 24cad7d4: Add iptables and ip6tables to core.mk.
* commit '24cad7d4f7962d3413d520791cb2b8a5a5266f58':
  Add iptables and ip6tables to core.mk.
2011-07-29 13:58:43 -07:00
Raphael Moll
266a571fbd am dceb4655: Merge "Add sdk/assetstudio to the Windows build paths."
* commit 'dceb46559eb8077553d1bd4d738fb4b325af9396':
  Add sdk/assetstudio to the Windows build paths.
2011-07-29 13:56:51 -07:00
Raphael Moll
dceb46559e Merge "Add sdk/assetstudio to the Windows build paths." 2011-07-29 13:50:51 -07:00
Ying Wang
24cad7d4f7 Add iptables and ip6tables to core.mk.
Change-Id: I1cb2be8a28013b20d1032a8d766021a2f4aca9e1
2011-07-29 13:47:23 -07:00
The Android Automerger
91ce04432a GWK15E
Change-Id: I60b7f8f0883594ed648ee1d97c0ac221645fa7a0
2011-07-29 13:46:55 -07:00
Raphael Moll
667ec86a33 Add sdk/assetstudio to the Windows build paths.
Change-Id: Ide8d418aa25cf39852a25e08fd2a27c7882586e7
2011-07-29 13:04:53 -07:00
The Android Automerger
caf5bbb922 HLK29
Change-Id: Iff165f81fde7af292c4763cc24c95dbc796548ab
2011-07-29 07:20:23 -07:00
The Android Automerger
7ddfdc787d merge in honeycomb-LTE-release history after reset to honeycomb-LTE 2011-07-29 07:20:16 -07:00
The Android Automerger
ab8ecc48e1 HLK28
Change-Id: I433b7584e4facbfa28699bb489d3afc6c6a28251
2011-07-28 07:25:07 -07:00
The Android Automerger
ca0c6ea604 merge in honeycomb-LTE-release history after reset to honeycomb-LTE 2011-07-28 07:25:00 -07:00
Scott Main
70e606653a docs: update api filtering to support provisional APIs (api levels that are string names)
Change-Id: I2df890739054e4130e455c9dcf5540a9c39f5ee3
2011-07-27 18:31:32 -07:00