LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,750 Commits 2 Branches 0 Tags
28f349bbb0d0fab0877d27dfac7ca2d9d4b6893d
Commit Graph

10750 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Stadler
28f349bbb0 Merge commit '7a494baf' into manualmerge 
Conflicts:
	ide/eclipse/.classpath

Change-Id: I0bb9abaef2525b38816f7901f13dd7ddb9167f4b
 2012-09-24 17:47:47 -07:00
Andy Stadler
7a494bafc0 am e61482e7: Fix .classpath to track bouncycastle/bcprov 
* commit 'e61482e7e58e73f2b8777719afd92cf75681bb3c':
  Fix .classpath to track bouncycastle/bcprov
 2012-09-24 17:39:42 -07:00
Andy Stadler
e61482e7e5 Fix .classpath to track bouncycastle/bcprov 
Change-Id: If8d142ebc96eb76f1e0b12a8d741f2e91b5d8598
 2012-09-24 17:34:26 -07:00
Xavier Ducrohet
e51e0d050f am 45480c46: am 34580b76: am fa82c449: am 45825eae: Update platform-tools sdk comp to 15. 
* commit '45480c46dd8e13329c53222067ef2d51deb79ed1':
  Update platform-tools sdk comp to 15.
 2012-09-24 15:04:21 -07:00
Xavier Ducrohet
45480c46dd am 34580b76: am fa82c449: am 45825eae: Update platform-tools sdk comp to 15. 
* commit '34580b76b65d83c3085fc63911b3651ce5dc8a57':
  Update platform-tools sdk comp to 15.
 2012-09-24 15:01:58 -07:00
Xavier Ducrohet
34580b76b6 am fa82c449: am 45825eae: Update platform-tools sdk comp to 15. 
* commit 'fa82c449aefa2a5d47d2342318a64ecb906bd1a9':
  Update platform-tools sdk comp to 15.
 2012-09-24 14:59:25 -07:00
Xavier Ducrohet
fa82c449ae am 45825eae: Update platform-tools sdk comp to 15. 
* commit '45825eae6b2f0436a52699db95644c6477cb6ce9':
  Update platform-tools sdk comp to 15.
 2012-09-24 14:57:36 -07:00
Xavier Ducrohet
45825eae6b Update platform-tools sdk comp to 15. 
Change-Id: Icdcf530ea223c1181b9be9bc1029f126c5558f1d
 2012-09-24 14:54:59 -07:00
Andrew Hsieh
c54556614a am b268da2b: am 47b1e0b6: am b07d7f6c: Merge "Update NDK headers" 
* commit 'b268da2bcc6c3a0c383c526921bcb1109c15469e':
  Update NDK headers
 2012-09-24 14:07:19 -07:00
Andrew Hsieh
b268da2bcc am 47b1e0b6: am b07d7f6c: Merge "Update NDK headers" 
* commit '47b1e0b6f7b31c644b156baba12613dfbc7c740f':
  Update NDK headers
 2012-09-24 14:05:15 -07:00
Andrew Hsieh
47b1e0b6f7 am b07d7f6c: Merge "Update NDK headers" 
* commit 'b07d7f6c25fe3ea99186c2cdb034449e75419518':
  Update NDK headers
 2012-09-24 14:03:09 -07:00
Andrew Hsieh
b07d7f6c25 Merge "Update NDK headers" 2012-09-24 13:54:51 -07:00
Daniel Sandler
4f316d8fd5 am 02d2b19f: am 35d22bff: Merge "Add screensavers to default Eclipse classpath." into jb-mr1-dev 
* commit '02d2b19fb6e5210e74bdb691511699424b0d12ed':
  Add screensavers to default Eclipse classpath.
 2012-09-24 13:45:40 -07:00
Daniel Sandler
02d2b19fb6 am 35d22bff: Merge "Add screensavers to default Eclipse classpath." into jb-mr1-dev 
* commit '35d22bff7a9010c68f079e5e401b1ae3b5847f51':
  Add screensavers to default Eclipse classpath.
 2012-09-24 13:43:48 -07:00
Daniel Sandler
35d22bff7a Merge "Add screensavers to default Eclipse classpath." into jb-mr1-dev 2012-09-24 13:42:41 -07:00
Andrew Hsieh
c6427a73a2 Update NDK headers 
Sync NDK headers with bionic's.  Most are new symbols.
The only big differences are in arch-mips/include/asm:

1) arch-mips/include/asm/unistd.h, see
   https://android-review.googlesource.com/#/c/40875
2) arch-mips/include/asm/*, see
   https://android-review.googlesource.com/#/c/43335
   https://android-review.googlesource.com/#/c/43440
   https://android-review.googlesource.com/#/c/43401

Change-Id: I8204f9b5f2f2c14a31dc28efc8a9d8c66cf73fe2
 2012-09-24 12:31:43 -07:00
Andrew Hsieh
d934da6685 am 1dc9b295: am cbe16156: am 0f0de77b: am b034233a: am 3c901267: Merge "Update README.CRT.TXT" 
* commit '1dc9b2957674aca17a496836432aef0c61447beb':
  Update README.CRT.TXT
 2012-09-24 10:23:12 -07:00
Andrew Hsieh
1dc9b29576 am cbe16156: am 0f0de77b: am b034233a: am 3c901267: Merge "Update README.CRT.TXT" 
* commit 'cbe16156939bf4637384885c093fd4ec6e3bc72d':
  Update README.CRT.TXT
 2012-09-24 10:20:00 -07:00
Andrew Hsieh
cbe1615693 am 0f0de77b: am b034233a: am 3c901267: Merge "Update README.CRT.TXT" 
* commit '0f0de77b131455192e51a0723fb7a79876a4ca17':
  Update README.CRT.TXT
 2012-09-24 10:16:42 -07:00
The Android Open Source Project
75c9244069 am 6045fb06: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit '6045fb06c5c8304a1ac9f3388d17a6009794e7d0':
 2012-09-24 10:13:04 -07:00
The Android Open Source Project
6045fb06c5 Reconcile with jb-mr1-release - do not merge 
Change-Id: I3660c9875037e7074623adeeeada1ff476413013
 2012-09-24 10:11:31 -07:00
Andrew Hsieh
0f0de77b13 am b034233a: am 3c901267: Merge "Update README.CRT.TXT" 
* commit 'b034233afae873b98b1b70841439b09fe5d58773':
  Update README.CRT.TXT
 2012-09-24 09:29:54 -07:00
Andrew Hsieh
b034233afa am 3c901267: Merge "Update README.CRT.TXT" 
* commit '3c901267609c17645999aa7a8ca95413ad528038':
  Update README.CRT.TXT
 2012-09-24 09:28:50 -07:00
Andrew Hsieh
3c90126760 Merge "Update README.CRT.TXT" 2012-09-24 09:24:05 -07:00
Yu Shan Emily Lau
90bbdd2e1b am 0c8fe324: am 1e1926db: Merge "For the recent SD card access change. The non-zogyte process need to use the Environment#getLegacyExternalStorage to access the sdcard." into jb-mr1-dev 
* commit '0c8fe324e579842cb04818a96016ef7b929e625a':
  For the recent SD card access change. The non-zogyte process need to use the Environment#getLegacyExternalStorage to access the sdcard.
 2012-09-24 00:51:37 -07:00
Jim Miller
9f08d1a5bb am 253dbf55: am 81a6b985: Merge "Add test case for new keyguard widget API" into jb-mr1-dev 
* commit '253dbf5569229a4d9db361f83a0e0067a81d0aaa':
  Add test case for new keyguard widget API
 2012-09-24 00:50:30 -07:00
Brett Chabot
5fe7538a8c am 523f3f89: am 99f717d7: Fix runtest syntax. 
* commit '523f3f894d1eb1a366239399fe07005d1a07ee5e':
  Fix runtest syntax.
 2012-09-24 00:48:59 -07:00
Brett Chabot
a75e8a374a am 834218e7: am e1bb1d3b: Merge "Make coverage work without test defs." into jb-mr1-dev 
* commit '834218e7fb82ddb86375682c2fba3bd24074a427':
  Make coverage work without test defs.
 2012-09-24 00:48:50 -07:00
Daniel Sandler
91fd25b045 Add screensavers to default Eclipse classpath. 
Change-Id: I691634e0f2dd6e3436087302caa09c9fb1eb92c2
 2012-09-22 20:29:34 -04:00
The Android Automerger
ee35616185 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-22 09:41:28 -07:00
Andrew Hsieh
a0de803db8 Update README.CRT.TXT 
Change-Id: I7d0ec48c09c47081c01c9366faf993317990b237
 2012-09-21 18:50:16 -07:00
Yu Shan Emily Lau
0c8fe324e5 am 1e1926db: Merge "For the recent SD card access change. The non-zogyte process need to use the Environment#getLegacyExternalStorage to access the sdcard." into jb-mr1-dev 
* commit '1e1926db0775acd045260511e5c2b62e596e377d':
  For the recent SD card access change. The non-zogyte process need to use the Environment#getLegacyExternalStorage to access the sdcard.
 2012-09-21 16:25:54 -07:00
Yu Shan Emily Lau
1e1926db07 Merge "For the recent SD card access change. The non-zogyte process need to use the Environment#getLegacyExternalStorage to access the sdcard." into jb-mr1-dev 2012-09-21 16:24:28 -07:00
Yu Shan Emily Lau
b894c71af8 For the recent SD card access change. 
The non-zogyte process need to use the
Environment#getLegacyExternalStorage to access the sdcard.

Change-Id: I797d235954defe25e1bd8728f167250e4f9d0fe9
 2012-09-21 16:20:12 -07:00
Jim Miller
253dbf5569 am 81a6b985: Merge "Add test case for new keyguard widget API" into jb-mr1-dev 
* commit '81a6b985e4abef7b2be291eb8aa0b85cc78cfd2a':
  Add test case for new keyguard widget API
 2012-09-21 15:25:49 -07:00
Jim Miller
81a6b985e4 Merge "Add test case for new keyguard widget API" into jb-mr1-dev 2012-09-21 15:22:28 -07:00
Brett Chabot
523f3f894d am 99f717d7: Fix runtest syntax. 
* commit '99f717d7d88cdfe55b5a9689544dceac9489f614':
  Fix runtest syntax.
 2012-09-21 13:06:16 -07:00
Brett Chabot
99f717d7d8 Fix runtest syntax. 
Change-Id: Ief41103c14c30d53f6c2fe8af5511386d57894c2
 2012-09-21 13:01:03 -07:00
Brett Chabot
834218e7fb am e1bb1d3b: Merge "Make coverage work without test defs." into jb-mr1-dev 
* commit 'e1bb1d3be9013226cc5750dc10cebe45c634765d':
  Make coverage work without test defs.
 2012-09-21 12:36:19 -07:00
Brett Chabot
e1bb1d3be9 Merge "Make coverage work without test defs." into jb-mr1-dev 2012-09-21 12:33:55 -07:00
Jim Miller
84fb279107 Add test case for new keyguard widget API 
Change-Id: Ibcb19c15964f4ea4bad36ec102e9aed8b4ea9c41
 2012-09-20 23:46:30 -07:00
The Android Open Source Project
6d5b5591aa am 3ad7d24a: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit '3ad7d24a9f397eae674191946b999d577d21090e':
 2012-09-20 12:48:51 -07:00
The Android Open Source Project
3ad7d24a9f Reconcile with jb-mr1-release - do not merge 
Change-Id: I77d91a9ffb6db5b62cb01f1ddeb288dd50787a8a
 2012-09-20 10:35:10 -07:00
Brett Chabot
3dd6d288f5 am f5e9dcd8: am 42c14447: Merge "Fix install of full build packages." into jb-mr1-dev 
* commit 'f5e9dcd82939e5077d003bbcbfd13752debf857b':
  Fix install of full build packages.
 2012-09-20 09:29:01 -07:00
Brett Chabot
8ac51186a6 Make coverage work without test defs. 
Change-Id: I946df038e97dc5c2f40a4610d4076e13ab6bde37
 2012-09-20 08:06:05 -07:00
The Android Automerger
7281ec92ae merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-20 06:59:26 -07:00
Brett Chabot
f5e9dcd829 am 42c14447: Merge "Fix install of full build packages." into jb-mr1-dev 
* commit '42c14447df3f46d1176675c0e021726bf6087519':
  Fix install of full build packages.
 2012-09-20 06:08:13 -07:00
Geremy Condra
5df6da94db Merge "Fixed runtest to work with python != 2.4" 2012-09-20 00:19:44 -07:00
Brett Chabot
42c14447df Merge "Fix install of full build packages." into jb-mr1-dev 2012-09-19 17:06:50 -07:00
Brett Chabot
b0b8c7816d Fix install of full build packages. 
Change-Id: I8296304b2297d3ac746920f5f2f70096d055a46c
 2012-09-19 08:32:56 -07:00