OSDN Git Service
The Android Open Source Project [Tue, 31 Jul 2012 14:51:15 +0000 (07:51 -0700)]
Sync with jb-mr1-dev
Change-Id: I31e76b5a358c14d5194eaf02b08a728d1ca9b4c5
Dianne Hackborn [Tue, 31 Jul 2012 00:38:04 +0000 (17:38 -0700)]
This branch is now JB MR1 development.
Change-Id: Id0463a82826c0fe4c518559fe40e4d6e088aaad9
The Android Open Source Project [Mon, 30 Jul 2012 22:03:25 +0000 (15:03 -0700)]
Reconcile with jb-mr1-release
Change-Id: I8a58307dd78dc6fa26d197408853e4f717b5bae9
The Android Automerger [Mon, 30 Jul 2012 16:46:30 +0000 (09:46 -0700)]
JOO30B
The Android Automerger [Mon, 30 Jul 2012 16:45:58 +0000 (09:45 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Mon, 30 Jul 2012 14:15:33 +0000 (07:15 -0700)]
JOO30
Ed Heyl [Mon, 30 Jul 2012 05:37:03 +0000 (22:37 -0700)]
am
68bd94e2: am
3d71b0c7: Merge "Add new vendors" into jb-mr1-dev
* commit '
68bd94e288985af0de983950e6fb98bfea62f19f':
Add new vendors
Ed Heyl [Mon, 30 Jul 2012 05:33:18 +0000 (22:33 -0700)]
am
3d71b0c7: Merge "Add new vendors" into jb-mr1-dev
* commit '
3d71b0c7e2c28008ba9658df0138008d66bd5d4a':
Add new vendors
Ed Heyl [Sun, 29 Jul 2012 23:35:27 +0000 (16:35 -0700)]
Merge "Add new vendors" into jb-mr1-dev
Shih-wei Liao [Sun, 29 Jul 2012 18:15:48 +0000 (11:15 -0700)]
am
06f20f02: am
b09d26a4: Add "abcc" (bitcode compiler) and "libportable" into system.img.
* commit '
06f20f0253bcbf7fd3079f6f80413aaabf91732d':
Add "abcc" (bitcode compiler) and "libportable" into system.img.
Shih-wei Liao [Sun, 29 Jul 2012 18:13:35 +0000 (11:13 -0700)]
am
b09d26a4: Add "abcc" (bitcode compiler) and "libportable" into system.img.
* commit '
b09d26a496609fd569e94f2cfbb289ba5ea4c247':
Add "abcc" (bitcode compiler) and "libportable" into system.img.
Shih-wei Liao [Sat, 28 Jul 2012 01:04:07 +0000 (18:04 -0700)]
Add "abcc" (bitcode compiler) and "libportable" into system.img.
BUG=
6886348. NDK on llvm requires bitcode compiler and libportable.
Change-Id: I6d45575518f312860e99e87d7b6eabc4ae7802fd
Jean-Baptiste Queru [Thu, 14 Jun 2012 22:41:30 +0000 (15:41 -0700)]
Add new vendors
Change-Id: Id0d3599257ae39077063bb5903c912526e02cb0e
Elliott Hughes [Fri, 27 Jul 2012 23:24:29 +0000 (16:24 -0700)]
am
7450e4f7: am
b286b76d: am
f833e0a7: am
b9c2a66a: Merge "Now zoneinfo prebuilts are Android modules."
* commit '
7450e4f7e6c2f6f78ddd8197606ebb807ca54dba':
Now zoneinfo prebuilts are Android modules.
The Android Open Source Project [Fri, 27 Jul 2012 23:23:41 +0000 (16:23 -0700)]
am
749ba850: am
b1418f47: am
024e9ab7: Reconcile with jb-mr0-release jb-release
* commit '
749ba85040ce608c8cc92207a7503249110fd706':
JZO26
JRO03L
JRO03K
JRO03J
JRO24
JRO03I
JZO24
Elliott Hughes [Fri, 27 Jul 2012 22:55:35 +0000 (15:55 -0700)]
am
b286b76d: am
f833e0a7: am
b9c2a66a: Merge "Now zoneinfo prebuilts are Android modules."
* commit '
b286b76da7d0b3de6f12664aad0cdc146c736cd1':
Now zoneinfo prebuilts are Android modules.
Elliott Hughes [Fri, 27 Jul 2012 22:51:16 +0000 (15:51 -0700)]
am
f833e0a7: am
b9c2a66a: Merge "Now zoneinfo prebuilts are Android modules."
* commit '
f833e0a780d576be76520c1d0b51035f589cec0b':
Now zoneinfo prebuilts are Android modules.
The Android Open Source Project [Fri, 27 Jul 2012 22:49:17 +0000 (15:49 -0700)]
am
b1418f47: am
024e9ab7: Reconcile with jb-mr0-release jb-release
* commit '
b1418f47dcf37c3d50b7c76e657ac00ce47d0618':
JZO26
JRO03L
JRO03K
JRO03J
JRO24
JRO03I
JZO24
Elliott Hughes [Fri, 27 Jul 2012 22:47:34 +0000 (15:47 -0700)]
am
b9c2a66a: Merge "Now zoneinfo prebuilts are Android modules."
* commit '
b9c2a66a4897b9be02d53f36bf9d212141c2dfb0':
Now zoneinfo prebuilts are Android modules.
The Android Open Source Project [Fri, 27 Jul 2012 22:47:19 +0000 (15:47 -0700)]
am
3166fd6a: Reconcile with jb-mr1-release
* commit '
3166fd6ad9a893f26e4f881328243fdfd8c6c029':
JOO26B
JOO26
JOO25
JOO24B
JOO24
The Android Open Source Project [Fri, 27 Jul 2012 22:45:19 +0000 (15:45 -0700)]
am
024e9ab7: Reconcile with jb-mr0-release jb-release
* commit '
024e9ab796609334a209062d449ddb4a73eb925e':
JZO26
JRO03L
JRO03K
JRO03J
JRO24
JRO03I
JZO24
The Android Open Source Project [Fri, 27 Jul 2012 22:44:32 +0000 (15:44 -0700)]
Reconcile with jb-mr1-release
Change-Id: I9132cf02a61b153013bd0c7e8d2a5e9dd3161ca4
The Android Open Source Project [Fri, 27 Jul 2012 21:49:57 +0000 (14:49 -0700)]
Reconcile with jb-mr0-release jb-release
Change-Id: I8b44c9fafc5d0a2c0d6ad959c5e2ed0ae02b3f54
Elliott Hughes [Fri, 27 Jul 2012 21:14:57 +0000 (14:14 -0700)]
Merge "Now zoneinfo prebuilts are Android modules."
Ying Wang [Thu, 26 Jul 2012 22:56:13 +0000 (15:56 -0700)]
Now zoneinfo prebuilts are Android modules.
(cherry-picked from
101d32ebb80f5f015781b98cb53739e8ad933cb4.)
Bug:
6857263
Change-Id: Ie0cd0efa4444eb0ee63a1a91890f4bb48539e7a7
Jean-Baptiste Queru [Fri, 27 Jul 2012 17:21:43 +0000 (10:21 -0700)]
Jean-Baptiste Queru [Fri, 27 Jul 2012 17:16:49 +0000 (10:16 -0700)]
Jean-Baptiste Queru [Fri, 27 Jul 2012 17:14:48 +0000 (10:14 -0700)]
Jean-Baptiste Queru [Fri, 27 Jul 2012 17:05:22 +0000 (10:05 -0700)]
Merge "Fix build."
Ying Wang [Thu, 26 Jul 2012 17:15:21 +0000 (10:15 -0700)]
Fix build.
Set BUILD_EMULATOR to true when HOST_OS is linux.
Disable the emulator package target if BUILD_EMULATOR is not true.
Change-Id: I8987c0a091622baa0e861b451e635c4ddb148b29
The Android Automerger [Fri, 27 Jul 2012 00:50:34 +0000 (17:50 -0700)]
JZO26
The Android Automerger [Fri, 27 Jul 2012 00:49:20 +0000 (17:49 -0700)]
merge in jb-mr0-release history after reset to jb-dev
The Android Automerger [Thu, 26 Jul 2012 23:06:25 +0000 (16:06 -0700)]
JRO03L
Ying Wang [Thu, 26 Jul 2012 22:56:13 +0000 (15:56 -0700)]
Now zoneinfo prebuilts are Android modules.
Bug:
6857263
Change-Id: I793f596926de485646ed9724d2b365a51fcf489f
Ying Wang [Thu, 26 Jul 2012 22:33:07 +0000 (15:33 -0700)]
am
89fa2850: Add clean step to introduce the newly added BUILD_EMULATOR.
* commit '
89fa2850cc3fd602b5ec2d049516459b6348f8b6':
Add clean step to introduce the newly added BUILD_EMULATOR.
Ying Wang [Thu, 26 Jul 2012 22:28:43 +0000 (15:28 -0700)]
Add clean step to introduce the newly added BUILD_EMULATOR.
Change-Id: I0de0625a12af0b98d6288df03024268326b909bf
Ying Wang [Thu, 26 Jul 2012 22:16:02 +0000 (15:16 -0700)]
Ying Wang [Thu, 26 Jul 2012 17:15:21 +0000 (10:15 -0700)]
Fix build.
Set BUILD_EMULATOR to true when HOST_OS is linux.
Disable the emulator package target if BUILD_EMULATOR is not true.
Change-Id: I8987c0a091622baa0e861b451e635c4ddb148b29
The Android Automerger [Thu, 26 Jul 2012 17:28:15 +0000 (10:28 -0700)]
JOO26B
Ying Wang [Thu, 26 Jul 2012 17:15:21 +0000 (10:15 -0700)]
Fix build.
Set BUILD_EMULATOR to true when HOST_OS is linux.
Disable the emulator package target if BUILD_EMULATOR is not true.
Change-Id: I8987c0a091622baa0e861b451e635c4ddb148b29
Ed Heyl [Thu, 26 Jul 2012 15:04:38 +0000 (08:04 -0700)]
am
f8a30598: resolved conflict in mergre to goog/master
* commit '
f8a30598925855cb387511d32a5b3388ebc908c8':
Joe Onorato [Thu, 26 Jul 2012 15:04:29 +0000 (08:04 -0700)]
Joe Onorato [Thu, 26 Jul 2012 15:04:28 +0000 (08:04 -0700)]
am
42f0127a: am
e3adc7fd: am
c22da7d7: Merge "Don\'t try to build the emulator on Mac OS if the right tools aren\'t installed."
* commit '
42f0127a068ecb540dc98dea23932e074d127b20':
Don't try to build the emulator on Mac OS if the right tools aren't installed.
Ed Heyl [Thu, 26 Jul 2012 15:02:49 +0000 (08:02 -0700)]
resolved conflicts w/
4b0c5ee8
Change-Id: Ic03a161b61d42504a7f45f1ac0ffebe3ac9b9e72
Ed Heyl [Thu, 26 Jul 2012 14:45:43 +0000 (07:45 -0700)]
resolved conflict in mergre to goog/master
Change-Id: I6ee3a8802595786a91a1bd77188648fda9dc3447
The Android Automerger [Thu, 26 Jul 2012 14:12:39 +0000 (07:12 -0700)]
JOO26
The Android Automerger [Thu, 26 Jul 2012 14:10:09 +0000 (07:10 -0700)]
merge in jb-mr1-release history after reset to master
Nick Kralevich [Thu, 26 Jul 2012 06:00:29 +0000 (23:00 -0700)]
am
07a06f6e: am
f0daadf6: am
297d6c02: Merge "Add property_contexts to SELINUX_DEPENDS."
* commit '
07a06f6e4487f2ad7d667d134fe19a089bee8412':
Add property_contexts to SELINUX_DEPENDS.
Joe Onorato [Thu, 26 Jul 2012 05:24:02 +0000 (22:24 -0700)]
Joe Onorato [Thu, 26 Jul 2012 05:24:00 +0000 (22:24 -0700)]
am
e3adc7fd: am
c22da7d7: Merge "Don\'t try to build the emulator on Mac OS if the right tools aren\'t installed."
* commit '
e3adc7fdcc04b7382d6818c5157c0a06eaf8c48f':
Don't try to build the emulator on Mac OS if the right tools aren't installed.
Joe Onorato [Thu, 26 Jul 2012 05:22:15 +0000 (22:22 -0700)]
Joe Onorato [Thu, 26 Jul 2012 05:22:14 +0000 (22:22 -0700)]
am
c22da7d7: Merge "Don\'t try to build the emulator on Mac OS if the right tools aren\'t installed."
* commit '
c22da7d7e2de0b4cbeefb533990d81581d19432a':
Don't try to build the emulator on Mac OS if the right tools aren't installed.
Joe Onorato [Thu, 26 Jul 2012 00:56:24 +0000 (17:56 -0700)]
Joe Onorato [Thu, 26 Jul 2012 00:55:03 +0000 (17:55 -0700)]
Should have been included in
74e883d1415f68dc52a7e679cd1ea1f486b8d8bb
Change-Id: Ia0d06a89d0efd36c877e51b0adb45ae7bb3e5480
Joe Onorato [Thu, 26 Jul 2012 00:41:49 +0000 (17:41 -0700)]
Merge "Don't try to build the emulator on Mac OS if the right tools aren't installed."
Andrew Hsieh [Wed, 25 Jul 2012 22:06:00 +0000 (15:06 -0700)]
am
c759e468: am
b7391efb: Merge "Add -fuse-ld=bfd to x86 target"
* commit '
c759e468995417a0c8c0ca7ca38e4c937a176ab8':
Add -fuse-ld=bfd to x86 target
Nick Kralevich [Wed, 25 Jul 2012 22:05:58 +0000 (15:05 -0700)]
am
f0daadf6: am
297d6c02: Merge "Add property_contexts to SELINUX_DEPENDS."
* commit '
f0daadf6988c823355e9b59996e3dc798b7b7619':
Add property_contexts to SELINUX_DEPENDS.
Joe Onorato [Wed, 25 Jul 2012 21:28:05 +0000 (14:28 -0700)]
Don't try to build the emulator on Mac OS if the right tools aren't installed.
Change-Id: I3cd2f82f9ee64174bddbb12a18ca8fcf23bdcebd
Andrew Hsieh [Wed, 25 Jul 2012 21:25:30 +0000 (14:25 -0700)]
am
b7391efb: Merge "Add -fuse-ld=bfd to x86 target"
* commit '
b7391efbf03d47876fd0747a5cf2199f6b4a503a':
Add -fuse-ld=bfd to x86 target
Nick Kralevich [Wed, 25 Jul 2012 21:25:28 +0000 (14:25 -0700)]
am
297d6c02: Merge "Add property_contexts to SELINUX_DEPENDS."
* commit '
297d6c02bc1e1c63404d8d81df28f3f13046fe85':
Add property_contexts to SELINUX_DEPENDS.
The Android Automerger [Wed, 25 Jul 2012 20:54:38 +0000 (13:54 -0700)]
JRO03K
Andrew Hsieh [Wed, 25 Jul 2012 20:40:30 +0000 (13:40 -0700)]
Merge "Add -fuse-ld=bfd to x86 target"
Andrew Hsieh [Wed, 25 Jul 2012 18:06:28 +0000 (11:06 -0700)]
Add -fuse-ld=bfd to x86 target
Add -fuse-ld=bfd because ld.gold doesn't support "--copy-dt-needed-entries".
Change-Id: I4e78967a076b3d093dd55366f7a54f0c9f9a45d1
Andrew Hsieh [Wed, 25 Jul 2012 07:35:35 +0000 (00:35 -0700)]
Add -fuse-ld=bfd to x86 target
Add -fuse-ld=bfd because ld.gold doesn't support "--copy-dt-needed-entries".
Change-Id: Ie6fa0a2ddfc57b650552c8cf0891f738a5be0dda
The Android Automerger [Wed, 25 Jul 2012 14:12:17 +0000 (07:12 -0700)]
JOO25
The Android Automerger [Wed, 25 Jul 2012 14:10:09 +0000 (07:10 -0700)]
merge in jb-mr1-release history after reset to master
Scott Main [Wed, 25 Jul 2012 05:05:48 +0000 (22:05 -0700)]
am
42950013: am
54d2a9b9: add bottom-margin to div-based notes
* commit '
42950013b7b80a085443d99c1676912f1398b752':
add bottom-margin to div-based notes
Scott Main [Wed, 25 Jul 2012 05:01:18 +0000 (22:01 -0700)]
am
54d2a9b9: add bottom-margin to div-based notes
* commit '
54d2a9b9ec90d3e4697f7915a183d8cfcc7e20b0':
add bottom-margin to div-based notes
The Android Automerger [Wed, 25 Jul 2012 03:31:56 +0000 (20:31 -0700)]
JRO03J
The Android Automerger [Wed, 25 Jul 2012 03:23:28 +0000 (20:23 -0700)]
JRO24
The Android Automerger [Wed, 25 Jul 2012 03:23:07 +0000 (20:23 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Wed, 25 Jul 2012 01:36:24 +0000 (18:36 -0700)]
JRO03I
Scott Main [Tue, 24 Jul 2012 21:54:32 +0000 (14:54 -0700)]
add bottom-margin to div-based notes
Change-Id: I4c74ab362b00bfb68093a975171f777e3fb5eef9
The Android Automerger [Tue, 24 Jul 2012 21:17:39 +0000 (14:17 -0700)]
JOO24B
The Android Automerger [Tue, 24 Jul 2012 19:39:49 +0000 (12:39 -0700)]
JZO24
The Android Automerger [Tue, 24 Jul 2012 19:39:22 +0000 (12:39 -0700)]
merge in jb-mr0-release history after reset to jb-dev
The Android Automerger [Tue, 24 Jul 2012 15:54:43 +0000 (08:54 -0700)]
JOO24
Scott Main [Tue, 24 Jul 2012 02:52:35 +0000 (19:52 -0700)]
am
905a015c: am
06cb5c73: Set the min height and width for images in carousel, set height of tabs so the selected indicator aligns with horizontal rule
* commit '
905a015c99816122e92d5e59f02efab8e2194958':
Set the min height and width for images in carousel, set height of tabs so the selected indicator aligns with horizontal rule
Ying Wang [Tue, 24 Jul 2012 02:49:48 +0000 (19:49 -0700)]
resolved conflicts for merge of
a8df6091 to master
Change-Id: I2d088c09738b34f72c2efa030304fca28ad0e791
Scott Main [Mon, 23 Jul 2012 21:38:57 +0000 (14:38 -0700)]
am
06cb5c73: Set the min height and width for images in carousel, set height of tabs so the selected indicator aligns with horizontal rule
* commit '
06cb5c73f3f62a2da0138d3f55e19c47a2632182':
Set the min height and width for images in carousel, set height of tabs so the selected indicator aligns with horizontal rule
Scott Main [Mon, 23 Jul 2012 21:34:34 +0000 (14:34 -0700)]
Set the min height and width for images in carousel, set height of tabs so the selected indicator aligns with horizontal rule
Change-Id: I0283e2634713d3fb6c99b465687c605e32a776f3
Ying Wang [Mon, 23 Jul 2012 17:32:54 +0000 (10:32 -0700)]
am
28437aac: Add LOCAL_SOURCE_FILES_ALL_GENERATED support
* commit '
28437aac999eb04d1698d9a6de87a25b5b772da6':
Add LOCAL_SOURCE_FILES_ALL_GENERATED support
Ying Wang [Thu, 19 Jul 2012 21:38:43 +0000 (14:38 -0700)]
Add LOCAL_SOURCE_FILES_ALL_GENERATED support
Set "LOCAL_SOURCE_FILES_ALL_GENERATED := true" if you want to build a
Java library from only generated source files, without any static
source files. Previously this is not allowed.
This is needed by building api stub libraries, which have only source
files of generated stub files.
Bug:
6814443
Change-Id: Idb2ae9c71a473b796154a03ef07a3403461c4f3c
Scott Main [Thu, 19 Jul 2012 18:14:58 +0000 (11:14 -0700)]
am
a24cd5eb: am
b72b7b84: Merge "docs: further specify design docs\' list styles to fix uls appearing like ols" into jb-dev
* commit '
a24cd5ebf0476c003fa97acb8eedbc9939166bca':
docs: further specify design docs' list styles to fix uls appearing like ols
Scott Main [Thu, 19 Jul 2012 18:13:41 +0000 (11:13 -0700)]
am
b72b7b84: Merge "docs: further specify design docs\' list styles to fix uls appearing like ols" into jb-dev
* commit '
b72b7b84b6c0c3a59da6f34531b362782090cabf':
docs: further specify design docs' list styles to fix uls appearing like ols
Scott Main [Thu, 19 Jul 2012 18:03:41 +0000 (11:03 -0700)]
Merge "docs: further specify design docs' list styles to fix uls appearing like ols" into jb-dev
Scott Main [Thu, 19 Jul 2012 18:01:27 +0000 (11:01 -0700)]
docs: further specify design docs' list styles to fix uls appearing like ols
Change-Id: I203daeafb390532e34687338d5c3d4a307ba680f
The Android Open Source Project [Thu, 19 Jul 2012 15:52:00 +0000 (08:52 -0700)]
am
2e5ae987: Reconcile with jb-mr0-release jb-release
* commit '
2e5ae9873c4f62f90342cd042eff457c7e1103f0':
JZO18
JZO17
JRO03H
JRO03G
JRO03F
JRO03E
JRO03D
JZO11
JZO10
The Android Open Source Project [Thu, 19 Jul 2012 15:35:48 +0000 (08:35 -0700)]
Reconcile with jb-mr0-release jb-release
Change-Id: Id8ba9e1858f97ba17d9f9b9080c0e18c0bebfa7b
The Android Automerger [Thu, 19 Jul 2012 04:45:08 +0000 (21:45 -0700)]
JZO18
The Android Automerger [Thu, 19 Jul 2012 04:44:37 +0000 (21:44 -0700)]
merge in jb-mr0-release history after reset to jb-dev
Scott Main [Thu, 19 Jul 2012 03:17:48 +0000 (20:17 -0700)]
am
3fae8d4e: am
71b28a60: Merge "docs: add check in hash-change callback to be sure we\'re only dealing with hash-tags that are search queries. bug:
6843654" into jb-dev
* commit '
3fae8d4e5685e604cc1dcc3c72745d6b521cfdc1':
docs: add check in hash-change callback to be sure we're only dealing with hash-tags that are search queries. bug:
6843654
Scott Main [Thu, 19 Jul 2012 03:17:47 +0000 (20:17 -0700)]
am
57267e56: am
55163c88: Doc change: add links to the More menu.
* commit '
57267e567f011d9db838b1a46be1290e563d6f77':
Doc change: add links to the More menu.
Scott Main [Thu, 19 Jul 2012 03:14:58 +0000 (20:14 -0700)]
am
71b28a60: Merge "docs: add check in hash-change callback to be sure we\'re only dealing with hash-tags that are search queries. bug:
6843654" into jb-dev
* commit '
71b28a600e52922a7a18b990f256b2fa104d32e8':
docs: add check in hash-change callback to be sure we're only dealing with hash-tags that are search queries. bug:
6843654
Scott Main [Thu, 19 Jul 2012 03:14:03 +0000 (20:14 -0700)]
am
55163c88: Doc change: add links to the More menu.
* commit '
55163c882e8d97d48f58f8ac86c394ce07548d8c':
Doc change: add links to the More menu.
Scott Main [Wed, 18 Jul 2012 23:59:41 +0000 (16:59 -0700)]
Merge "docs: add check in hash-change callback to be sure we're only dealing with hash-tags that are search queries. bug:
6843654" into jb-dev
Scott Main [Wed, 18 Jul 2012 23:53:22 +0000 (16:53 -0700)]
docs: add check in hash-change callback to be sure we're only dealing with hash-tags that are search queries.
bug:
6843654
Change-Id: I5fee7426d8ad404a5f03f37297fe72009df30de7
Scott Main [Wed, 18 Jul 2012 23:18:25 +0000 (16:18 -0700)]
Doc change: add links to the More menu.
Change-Id: I77e848f86278781b0a44eb672ea711e00352fde5
Colin Cross [Wed, 18 Jul 2012 23:00:48 +0000 (16:00 -0700)]
pdk: add telephony-common and mms-common
Factory test apps may need to compile against telephony-common and
mms-common, include the jars in the pdk platform.zip.
Change-Id: Ic3533ec42115150b94298f15acd877ef61c6660c
Nick Kralevich [Wed, 18 Jul 2012 20:55:09 +0000 (13:55 -0700)]
Merge "Add property_contexts to SELINUX_DEPENDS."