Commit graph

5821 commits

Author SHA1 Message Date
The Android Automerger
8ee21d74e3 merge in honeycomb-mr2-release history after reset to honeycomb-mr2 2011-06-06 07:10:48 -07:00
The Android Automerger
08a533bc5c HLJ67
Change-Id: I8dff96060e3e7055540f7da6b51240bdd040a3e1
2011-06-06 06:07:30 -07:00
The Android Automerger
26a9aff674 merge in honeycomb-LTE-release history after reset to honeycomb-LTE 2011-06-06 06:07:23 -07:00
The Android Automerger
4b373e3660 HLJ65
Change-Id: I15f0314d3957aeada8e3a3c50806a55dc75d7be1
2011-06-04 09:53:48 -07:00
The Android Automerger
8edbd44f58 merge in honeycomb-LTE-release history after reset to honeycomb-LTE 2011-06-04 09:53:42 -07:00
Doug Kwan
f524df7ce1 Clear LOCAL_RTTI_FLAG.
Change-Id: I0f1388e76af1ce0592cd3271a689fbb6c0ea3eba
2011-06-03 18:26:48 -07:00
Chia-chi Yeh
3a712fb0fa Add VpnDialogs for user space VPN.
Also remove CryptKeeper as it was merged into Settings.

Change-Id: I2f2be7e7f78dbb7c303a30c79d2f6ebcc96b9951
2011-06-03 17:57:03 -07:00
The Android Automerger
decf3a871a HLJ64B
Change-Id: I5fed324d11ec024ed88a6f70b6ad5075c2982059
2011-06-03 14:58:33 -07:00
The Android Automerger
20e7fccd69 merge in honeycomb-LTE-release history after reset to honeycomb-LTE 2011-06-03 14:58:27 -07:00
The Android Automerger
428175806f HLJ64
Change-Id: I9cdd419c478f47ddd8bfcb543da82fc3c6b92e88
2011-06-03 08:55:28 -07:00
The Android Automerger
f96c750174 merge in honeycomb-LTE-release history after reset to honeycomb-LTE 2011-06-03 08:55:17 -07:00
The Android Automerger
9c49767cf3 HTJ64
Change-Id: Idd922f6ca79b8add0143368bf76802faeae90334
2011-06-03 08:40:16 -07:00
The Android Automerger
5a75908f70 merge in honeycomb-mr2-release history after reset to honeycomb-mr2 2011-06-03 08:40:12 -07:00
Ying Wang
4387dc3ee1 am 823f6389: am 3487736b: am 7d83ef8f: Support custom RenderScript compiler
* commit '823f63894fb4ad5c1280a5ee7eb004792223a488':
  Support custom RenderScript compiler
2011-06-02 16:49:33 -07:00
Scott Main
131c79cbd0 am 9b6614d5: am e02449dc: am 44c32b95: Merge "docs: adjust sdk page to show/hide messages based on whether online or offline docs mutually dependent on Change-Id: Ie7490973001530098d5001d9ef5e4dbfab86ed08" into honeycomb-mr2
* commit '9b6614d58bf3ed4ad127bc607405af834c349662':
  docs: adjust sdk page to show/hide messages based on whether online or offline docs mutually dependent on Change-Id: Ie7490973001530098d5001d9ef5e4dbfab86ed08
2011-06-02 16:22:44 -07:00
Ying Wang
32945410b9 am bb567df0: am 4cd9e2d9: am 06e2f72b: Support to run dex-preopt on prebuilt apks.
* commit 'bb567df00abfe33d800339eba089b8cfd91a7785':
  Support to run dex-preopt on prebuilt apks.
2011-06-02 14:06:24 -07:00
The Android Automerger
a5be00354e HTJ63
Change-Id: I94d314cf2a2ce9c5fc77e7f484b5f719a552a4fd
2011-06-02 07:10:52 -07:00
The Android Automerger
ce9e3ee81b merge in honeycomb-mr2-release history after reset to honeycomb-mr2 2011-06-02 07:10:40 -07:00
The Android Automerger
d44574db81 HLJ63
Change-Id: If3f71c0865d0427fee14ffae7cae5fca7d3c31c8
2011-06-02 06:08:23 -07:00
The Android Automerger
59247d02cf merge in honeycomb-LTE-release history after reset to honeycomb-LTE 2011-06-02 06:08:16 -07:00
The Android Automerger
5bd28411cb keep history 2011-06-01 15:46:19 -07:00
Jean-Baptiste Queru
5adc2d054f am c33e0739: Merge from gingerbread
* commit 'c33e07396b4de4453c9212aaeb13c0c36b875589':
2011-06-01 14:26:18 -07:00
Jean-Baptiste Queru
c33e07396b Merge from gingerbread
Change-Id: If6c009d62eb4b2ed931d3e5082d08ad996aca689
2011-06-01 14:09:28 -07:00
The Android Automerger
61488d54b9 HLJ59C
Change-Id: Ia1229f139e0d34f3263d0901c22601a9a8a9412f
2011-06-01 13:48:00 -07:00
Jean-Baptiste Queru
b94d74611e Reconcile with gingerbread-mr2-release
Change-Id: I98de118c52ed658a448c2e885a481eece75257a3
2011-06-01 13:27:33 -07:00
The Android Automerger
a3a10f981c HTJ62B
Change-Id: Ibda60ed391f4b579f53cb01456140d3e3044d584
2011-06-01 13:12:12 -07:00
Doug Kwan
e804fc92ec Merge "Allow enabling RTTI in a module." 2011-06-01 11:23:20 -07:00
Jean-Baptiste Queru
c1efb06045 am 3c60c67a: Merge from open-source gingerbread
* commit '3c60c67ad2a157f5bfb731accfc74f5b42c69851':
  Relax the constraint of 64bit build environment.
2011-06-01 08:07:56 -07:00
Jean-Baptiste Queru
3c60c67ad2 Merge from open-source gingerbread
Change-Id: I417fc97191a14102617c0a87718bb690a1944e8b
2011-06-01 07:42:19 -07:00
The Android Automerger
bc62e71683 HTJ62
Change-Id: If3aada3c898f34fefba87fb0b078fb9261c01d43
2011-06-01 07:10:27 -07:00
The Android Automerger
fe67cbd33b merge in honeycomb-mr2-release history after reset to honeycomb-mr2 2011-06-01 07:10:21 -07:00
The Android Automerger
fe74c99d54 HLJ62
Change-Id: I4a80cb869fea85b08c48faaae17c140cddd50870
2011-06-01 06:09:56 -07:00
The Android Automerger
6d90217271 merge in honeycomb-LTE-release history after reset to honeycomb-LTE 2011-06-01 06:09:42 -07:00
Joe Onorato
149dd914b8 Switch the java encoding from ascii to utf8.
Change-Id: Iee0972df68b44fc8c653812cf165b57350a7ec5d
2011-05-31 18:21:07 -07:00
Ed Heyl
dfff9cd9bb GT the gingerbread-mr2-release branch
Change-Id: I22d6f9759fada4d7970dc915119345eb3fba24d4
2011-05-31 14:05:14 -07:00
Jean-Baptiste Queru
8cbdef7eba Merge "Relax the constraint of 64bit build environment." into gingerbread 2011-05-31 14:03:21 -07:00
The Android Automerger
0fd310a9f9 HTJ61B
Change-Id: Ib02f4934b0288205d18fe4509023c91a8fa539ff
2011-05-31 11:42:14 -07:00
Dan Bornstein
f7ad63ae65 Clean up how dex preoptimization gets configured.
Change-Id: I505ac438f1b963060b4be36d94bb5fbee6112dc5
2011-05-31 10:36:55 -07:00
The Android Automerger
1e679d42af HTJ61
Change-Id: I754599d3010650ee2e9882b43600add6d0a8c7bb
2011-05-31 07:09:42 -07:00
The Android Automerger
7f299c2535 merge in honeycomb-mr2-release history after reset to honeycomb-mr2 2011-05-31 07:09:35 -07:00
The Android Automerger
f9cff86d89 HLJ61
Change-Id: I6c9b504f66794e67ed74abb6c1c48c3ee486319f
2011-05-31 06:08:21 -07:00
The Android Automerger
ed0344615c merge in honeycomb-LTE-release history after reset to honeycomb-LTE 2011-05-31 06:08:08 -07:00
The Android Automerger
47f5072ceb HTJ60
Change-Id: If1681ab7490f9d85dc6f98489d4d6e9dd94e1ea7
2011-05-30 07:10:23 -07:00
The Android Automerger
cec1846f03 merge in honeycomb-mr2-release history after reset to honeycomb-mr2 2011-05-30 07:10:19 -07:00
The Android Automerger
97b37cf49f HLJ60
Change-Id: I36aa1631a8e00896c9d3b20cfb3ed20226f4244d
2011-05-30 06:02:23 -07:00
The Android Automerger
3a34ecbf08 merge in honeycomb-LTE-release history after reset to honeycomb-LTE 2011-05-30 06:02:19 -07:00
The Android Automerger
158db58800 HLJ59B
Change-Id: Icde595e06a0940d823996b96db9c85f34e4602c4
2011-05-29 20:09:52 -07:00
The Android Automerger
674ed2d600 merge in honeycomb-LTE-release history after reset to honeycomb-LTE 2011-05-29 20:09:45 -07:00
The Android Automerger
3751a3a23c HLJ59
Change-Id: Ib78243e109a362ecc470e57fbc2ab3ee299b5b6d
2011-05-29 07:44:48 -07:00
The Android Automerger
5b3019954b merge in honeycomb-LTE-release history after reset to honeycomb-LTE 2011-05-29 07:44:39 -07:00