Andrew Hsieh
47b1e0b6f7
am b07d7f6c: Merge "Update NDK headers"
...
* commit 'b07d7f6c25fe3ea99186c2cdb034449e75419518':
Update NDK headers
2012-09-24 14:03:09 -07:00
Daniel Sandler
4cd230cfc7
am 35d22bff: Merge "Add screensavers to default Eclipse classpath." into jb-mr1-dev
...
* commit '35d22bff7a9010c68f079e5e401b1ae3b5847f51':
Add screensavers to default Eclipse classpath.
2012-09-24 14:00:09 -07:00
Andrew Hsieh
b07d7f6c25
Merge "Update NDK headers"
2012-09-24 13:54:51 -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
f98c2fd1a8
am cbe16156: am 0f0de77b: am b034233a: am 3c901267: Merge "Update README.CRT.TXT"
...
* commit 'cbe16156939bf4637384885c093fd4ec6e3bc72d':
Update README.CRT.TXT
2012-09-24 10:20: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
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
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
30ed756d5e
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 17:50:08 -07:00
Jim Miller
ceff47f2b7
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 17:49:02 -07:00
Brett Chabot
da07f2624b
am 99f717d7: Fix runtest syntax.
...
* commit '99f717d7d88cdfe55b5a9689544dceac9489f614':
Fix runtest syntax.
2012-09-21 17:47:47 -07:00
Brett Chabot
6a1c1d1217
am e1bb1d3b: Merge "Make coverage work without test defs." into jb-mr1-dev
...
* commit 'e1bb1d3be9013226cc5750dc10cebe45c634765d':
Make coverage work without test defs.
2012-09-21 17:47:38 -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
3ad7d24a9f
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I77d91a9ffb6db5b62cb01f1ddeb288dd50787a8a
2012-09-20 10:35:10 -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
6501dc6e07
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:22:00 -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
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
The Android Automerger
00a159d658
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-19 07:01:30 -07:00
Doug Zongker
c7501c2571
am c31f70a3: center text, fix extents for multiline texts
...
* commit 'c31f70a3e4b9464742b699f0e3f92f02fee0ddd6':
center text, fix extents for multiline texts
2012-09-18 16:54:30 -07:00
Doug Zongker
c93f5d847e
am c31f70a3: center text, fix extents for multiline texts
...
* commit 'c31f70a3e4b9464742b699f0e3f92f02fee0ddd6':
center text, fix extents for multiline texts
2012-09-18 15:58:11 -07:00
Doug Zongker
c31f70a3e4
center text, fix extents for multiline texts
...
Bug: 7064142
Change-Id: I3c423c54609b28def1db56084190bf10b87f40f8
2012-09-18 15:47:52 -07:00
Baligh Uddin
10562f5f65
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-09-18 14:45:47 -07:00
Doug Zongker
7b0a137a67
am 608a5afb: update the localizer tool to use all available translations
...
* commit '608a5afb925a25930f4b1a00a23276298a65c80c':
update the localizer tool to use all available translations
2012-09-18 14:03:59 -07:00
Doug Zongker
87914eadbc
am 608a5afb: update the localizer tool to use all available translations
...
* commit '608a5afb925a25930f4b1a00a23276298a65c80c':
update the localizer tool to use all available translations
2012-09-18 13:48:27 -07:00
Doug Zongker
608a5afb92
update the localizer tool to use all available translations
...
Bug: 7064142
Change-Id: I606b7e2cf4bd2ab58c14af969a98089960100ff5
2012-09-18 12:40:57 -07:00
Baligh Uddin
cb5b7238a3
Import translations. DO NOT MERGE
...
Change-Id: I11f57138ffae5810804fa375d23d6c80f2d67a29
Auto-generated-cl: translation import
2012-09-18 11:31:06 -07:00
The Android Automerger
4269b2151c
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-16 06:59:25 -07:00
Baligh Uddin
c705b4190b
am 5f25ef04: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '5f25ef041243c52fc97b5e3cdea0dfa3af64245c':
Import translations. DO NOT MERGE
2012-09-14 16:10:23 -07:00
Baligh Uddin
9c41fd5377
am 5f25ef04: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '5f25ef041243c52fc97b5e3cdea0dfa3af64245c':
Import translations. DO NOT MERGE
2012-09-14 16:10:18 -07:00
Baligh Uddin
5f25ef0412
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-09-14 16:08:28 -07:00