OSDN Git Service
The Android Automerger [Tue, 18 Jun 2013 14:51:54 +0000 (07:51 -0700)]
"AAR79"
The Android Automerger [Tue, 18 Jun 2013 14:49:20 +0000 (07:49 -0700)]
merge in master-release history after reset to master
The Android Automerger [Mon, 17 Jun 2013 23:14:06 +0000 (16:14 -0700)]
AAR78B
Scott Main [Mon, 17 Jun 2013 22:32:59 +0000 (15:32 -0700)]
am
e721f9df: am
d7026f7a: add new script to toggle visibility of nested list items. call hideNestedItems(), giving it the parent list to toggle and the <a> element that performs the toggle
* commit '
e721f9df243534ca4b414641c109db3a24d36357':
add new script to toggle visibility of nested list items. call hideNestedItems(), giving it the parent list to toggle and the <a> element that performs the toggle
Scott Main [Mon, 17 Jun 2013 22:31:15 +0000 (15:31 -0700)]
am
d7026f7a: add new script to toggle visibility of nested list items. call hideNestedItems(), giving it the parent list to toggle and the <a> element that performs the toggle
* commit '
d7026f7a5f2250246d1441e1474ff9393fe5218d':
add new script to toggle visibility of nested list items. call hideNestedItems(), giving it the parent list to toggle and the <a> element that performs the toggle
Scott Main [Mon, 17 Jun 2013 22:08:49 +0000 (15:08 -0700)]
add new script to toggle visibility of nested list items.
call hideNestedItems(), giving it the parent list to toggle and the <a> element that performs the toggle
Change-Id: I6f1ee74b957f88c23550145c6ed057d8e7797c99
Christopher Tate [Mon, 17 Jun 2013 21:27:03 +0000 (14:27 -0700)]
Clean up /system/app -> /system/priv-app in incremental builds
Change-Id: Ib5596532e042e11cb1227d8a33367d24a3163431
The Android Automerger [Mon, 17 Jun 2013 14:54:23 +0000 (07:54 -0700)]
"AAR78"
The Android Automerger [Mon, 17 Jun 2013 14:49:48 +0000 (07:49 -0700)]
merge in master-release history after reset to master
The Android Open Source Project [Mon, 17 Jun 2013 14:33:32 +0000 (07:33 -0700)]
am
f0db5962: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
f0db59627543ef0ae918039870de5583f5e475c9':
"JSR78"
The Android Open Source Project [Mon, 17 Jun 2013 14:31:38 +0000 (07:31 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I648e611890e12e68d1be949fe474a2a5e19200a4
The Android Automerger [Mon, 17 Jun 2013 12:55:31 +0000 (05:55 -0700)]
"JSR78"
The Android Automerger [Mon, 17 Jun 2013 12:55:05 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Open Source Project [Sun, 16 Jun 2013 14:45:35 +0000 (07:45 -0700)]
am
c5ffd941: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '
c5ffd941710d24a59dd12608e3fc152510e70668':
"JSR77"
Remove mediarouter v7 support library from SDK.
JWR66N
The Android Open Source Project [Sun, 16 Jun 2013 14:43:37 +0000 (07:43 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I676e94de2cbbc9941fe4a895a55b2d5325babb88
The Android Automerger [Sun, 16 Jun 2013 12:56:42 +0000 (05:56 -0700)]
"JSR77"
The Android Automerger [Sun, 16 Jun 2013 12:55:16 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Jeff Brown [Fri, 14 Jun 2013 22:46:29 +0000 (15:46 -0700)]
Remove mediarouter v7 support library from SDK.
Bug:
9425325
Change-Id: Iba64455cf8bcf4892ff9bf10628e7b5272787a1e
The Android Automerger [Sat, 15 Jun 2013 19:18:10 +0000 (12:18 -0700)]
JWR66N
Jeff Brown [Fri, 14 Jun 2013 23:43:23 +0000 (16:43 -0700)]
am
bd1c3a21: am
0eacd936: Remove mediarouter v7 support library from SDK.
* commit '
bd1c3a2112d023e9f0aab115c64ba345c666ebe5':
Remove mediarouter v7 support library from SDK.
Jeff Brown [Fri, 14 Jun 2013 23:42:09 +0000 (16:42 -0700)]
am
0eacd936: Remove mediarouter v7 support library from SDK.
* commit '
0eacd936b7d6dabd380ecd6f1d25d39625b37495':
Remove mediarouter v7 support library from SDK.
Jeff Brown [Fri, 14 Jun 2013 22:46:29 +0000 (15:46 -0700)]
Remove mediarouter v7 support library from SDK.
Bug:
9425325
Change-Id: Iba64455cf8bcf4892ff9bf10628e7b5272787a1e
The Android Open Source Project [Fri, 14 Jun 2013 19:37:53 +0000 (12:37 -0700)]
am
9bfdf4d5: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
9bfdf4d539d011f0be59370d61dcbf257b3ae578':
JWR66M
The Android Open Source Project [Fri, 14 Jun 2013 19:32:53 +0000 (12:32 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: If2d4012040805ba406dd14909d6a6773b8060eef
Mike Lockwood [Fri, 14 Jun 2013 17:52:50 +0000 (10:52 -0700)]
Add support for WITHOUT_CLANG
Change-Id: I12e776e44c69649bca34c35eff2ee7c75cfe62cd
The Android Automerger [Fri, 14 Jun 2013 00:11:13 +0000 (17:11 -0700)]
JWR66M
The Android Open Source Project [Thu, 13 Jun 2013 15:25:36 +0000 (08:25 -0700)]
am
1e6cb5a8: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '
1e6cb5a8f26420bf94c6bc194d95002d9366caa4':
"JSR74"
JWR66L
JWR66K
The Android Open Source Project [Thu, 13 Jun 2013 15:22:30 +0000 (08:22 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I986e60e5558ca20ee361e768c46692bbbfc46237
The Android Automerger [Thu, 13 Jun 2013 12:56:10 +0000 (05:56 -0700)]
"JSR74"
The Android Automerger [Thu, 13 Jun 2013 12:55:11 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Automerger [Thu, 13 Jun 2013 06:25:14 +0000 (23:25 -0700)]
JWR66L
The Android Automerger [Thu, 13 Jun 2013 03:52:33 +0000 (20:52 -0700)]
JWR66K
The Android Open Source Project [Thu, 13 Jun 2013 01:06:07 +0000 (18:06 -0700)]
am
d8ef19b0: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
d8ef19b0c8a57daea726ad93edbbe396b9e9f5d3':
JWR66J
JWR66I
The Android Open Source Project [Thu, 13 Jun 2013 01:03:58 +0000 (18:03 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I3dff434f8e95a5c15b4ef4bca3c05bdfa163df0e
The Android Automerger [Thu, 13 Jun 2013 00:06:04 +0000 (17:06 -0700)]
JWR66J
Ying Wang [Wed, 12 Jun 2013 22:41:57 +0000 (15:41 -0700)]
am
fe365531: am
1e1241ce: Dist static Java library modules.
* commit '
fe365531b0ee363640fb50d5a230c0b999fbbe4d':
Dist static Java library modules.
Ying Wang [Wed, 12 Jun 2013 22:38:05 +0000 (15:38 -0700)]
am
1e1241ce: Dist static Java library modules.
* commit '
1e1241ce3d4259bcc4a0039ed68fc5b3fc8069b5':
Dist static Java library modules.
Ying Wang [Wed, 12 Jun 2013 22:25:23 +0000 (15:25 -0700)]
Dist static Java library modules.
With this change, we can build and dist static jar files, as well as
apks.
Bug:
9386024
Change-Id: Iab4660d8dfd7a2d164714a2124445de298075901
The Android Automerger [Wed, 12 Jun 2013 21:26:14 +0000 (14:26 -0700)]
JWR66I
Ying Wang [Wed, 12 Jun 2013 18:12:04 +0000 (11:12 -0700)]
am
8f586805: am
38cdd442: Tweak proguard flags in the 2 files.
* commit '
8f5868057c6c84760e8419792b0009cb1d133861':
Tweak proguard flags in the 2 files.
Ying Wang [Wed, 12 Jun 2013 18:09:33 +0000 (11:09 -0700)]
am
38cdd442: Tweak proguard flags in the 2 files.
* commit '
38cdd4429f23d9a0d27a6d8cfe318c29b604afbf':
Tweak proguard flags in the 2 files.
Ying Wang [Thu, 30 May 2013 17:45:46 +0000 (10:45 -0700)]
Tweak proguard flags in the 2 files.
So all most commonly-used flags go to proguard_basic_keeps.flags
and they will still be applied when LOCAL_PROGUARD_ENABLED=nosystem.
Bug:
9203442
Change-Id: If018076dc625ac1efe31898b179dbba850218aaf
The Android Automerger [Wed, 12 Jun 2013 14:53:38 +0000 (07:53 -0700)]
"AAR73"
The Android Automerger [Wed, 12 Jun 2013 14:49:40 +0000 (07:49 -0700)]
merge in master-release history after reset to master
The Android Open Source Project [Wed, 12 Jun 2013 14:26:01 +0000 (07:26 -0700)]
am
8870070d: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '
8870070d426f910cc223b3ea4f2f33a1c477014a':
"JSR73"
JWR66H
The Android Open Source Project [Wed, 12 Jun 2013 14:23:10 +0000 (07:23 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I9f012993eb7dccac74fec611f0ea1c8dcd71d93f
The Android Automerger [Wed, 12 Jun 2013 12:56:41 +0000 (05:56 -0700)]
"JSR73"
The Android Automerger [Wed, 12 Jun 2013 12:55:47 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Automerger [Wed, 12 Jun 2013 00:39:53 +0000 (17:39 -0700)]
JWR66H
The Android Open Source Project [Tue, 11 Jun 2013 22:37:02 +0000 (15:37 -0700)]
am
31b161ce: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
31b161cedce884cb7a1426f810d4e1cba9d33f46':
"JSR72"
The Android Automerger [Tue, 11 Jun 2013 22:06:32 +0000 (15:06 -0700)]
AAR72B
The Android Open Source Project [Tue, 11 Jun 2013 21:56:39 +0000 (14:56 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I40a07d0eebc9a1ff517241b9788f30c047a62692
The Android Automerger [Tue, 11 Jun 2013 14:53:12 +0000 (07:53 -0700)]
"AAR72"
The Android Automerger [Tue, 11 Jun 2013 14:49:18 +0000 (07:49 -0700)]
merge in master-release history after reset to master
Torne (Richard Coles) [Tue, 11 Jun 2013 13:13:45 +0000 (13:13 +0000)]
Merge "Add webviewchromium to the preopt jar list."
The Android Automerger [Tue, 11 Jun 2013 12:56:01 +0000 (05:56 -0700)]
"JSR72"
The Android Automerger [Tue, 11 Jun 2013 12:55:07 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Open Source Project [Tue, 11 Jun 2013 01:21:08 +0000 (18:21 -0700)]
am
63452300: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
6345230095ac4ac7eb45c71caccd5a4b02942a8e':
JWR66G
JWR66F
JWR66E
The Android Open Source Project [Tue, 11 Jun 2013 01:19:13 +0000 (18:19 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I9644ec405e9bd0ce498ab424f5f38cf2920ea1d6
The Android Automerger [Mon, 10 Jun 2013 23:45:28 +0000 (16:45 -0700)]
JWR66G
The Android Automerger [Mon, 10 Jun 2013 23:07:05 +0000 (16:07 -0700)]
JWR66F
The Android Automerger [Mon, 10 Jun 2013 22:16:12 +0000 (15:16 -0700)]
JWR66E
The Android Automerger [Mon, 10 Jun 2013 22:12:41 +0000 (15:12 -0700)]
AAR71B
The Android Open Source Project [Mon, 10 Jun 2013 18:11:50 +0000 (11:11 -0700)]
am
6c1d6385: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '
6c1d6385622798247881e8750864d17f49038e4c':
"JSR71"
"JSR70"
JWR66D
JWR66C
JWR66B
The Android Automerger [Mon, 10 Jun 2013 16:54:46 +0000 (09:54 -0700)]
"AAR71"
The Android Automerger [Mon, 10 Jun 2013 16:52:26 +0000 (09:52 -0700)]
merge in master-release history after reset to master
The Android Open Source Project [Mon, 10 Jun 2013 15:13:29 +0000 (08:13 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I80cacfe6593b8595da9df2827790fc763c1a25ee
The Android Automerger [Mon, 10 Jun 2013 12:55:35 +0000 (05:55 -0700)]
"JSR71"
The Android Automerger [Mon, 10 Jun 2013 12:55:03 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Automerger [Sun, 9 Jun 2013 12:56:51 +0000 (05:56 -0700)]
"JSR70"
The Android Automerger [Sun, 9 Jun 2013 12:55:22 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Automerger [Fri, 7 Jun 2013 22:13:44 +0000 (15:13 -0700)]
JWR66D
The Android Automerger [Fri, 7 Jun 2013 17:42:45 +0000 (10:42 -0700)]
AAR66E
The Android Automerger [Fri, 7 Jun 2013 16:35:56 +0000 (09:35 -0700)]
AAR66D
Ying Wang [Fri, 7 Jun 2013 01:05:53 +0000 (18:05 -0700)]
Remove unnecessary dependencies between host and target modules.
With this change, modules introduced by LOCAL_REQUIRED_MODULES will be
split by host/target: target modules only depend on target modules and
host modules only depend on host modules.
Bug:
9303948
Change-Id: I4078a7983aa3c00e99534f3f170dfe4b66b12287
The Android Automerger [Thu, 6 Jun 2013 23:42:07 +0000 (16:42 -0700)]
JWR66C
The Android Automerger [Thu, 6 Jun 2013 22:09:23 +0000 (15:09 -0700)]
JWR66B
The Android Automerger [Thu, 6 Jun 2013 21:03:42 +0000 (14:03 -0700)]
AAR66C
The Android Automerger [Thu, 6 Jun 2013 19:17:59 +0000 (12:17 -0700)]
AAR66B
The Android Open Source Project [Thu, 6 Jun 2013 17:38:55 +0000 (10:38 -0700)]
am
f2d5533e: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '
f2d5533e87b18069b77abea531dfdee627306887':
"JSR67"
JWR66
"JSR66"
JWR65
The Android Open Source Project [Thu, 6 Jun 2013 17:36:57 +0000 (10:36 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I23c04c52ecd129d541eaaf3a3a597e5533a6bc59
Torne (Richard Coles) [Thu, 6 Jun 2013 13:57:42 +0000 (14:57 +0100)]
Add webviewchromium to the preopt jar list.
The default BOOTCLASSPATH now includes webviewchromium.jar, so also add
it to the dex_preopt list.
Change-Id: I67b87cb0bf997c74596c276314a5196f8cf0d1b4
The Android Automerger [Thu, 6 Jun 2013 12:56:22 +0000 (05:56 -0700)]
"JSR67"
The Android Automerger [Thu, 6 Jun 2013 12:55:18 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Stephen Hines [Thu, 6 Jun 2013 03:25:40 +0000 (20:25 -0700)]
Remove abcc from build.
Change-Id: I9ca5deea98adbba03081349c16a391a9dd84e347
T.R. Fullhart [Wed, 5 Jun 2013 23:38:11 +0000 (16:38 -0700)]
am
cfe8d122: am
37e1052c: Add support for using custom signapk.jar.
* commit '
cfe8d12213daf8b6de51679ee9686c4042ed944e':
Add support for using custom signapk.jar.
T.R. Fullhart [Wed, 5 Jun 2013 23:36:49 +0000 (16:36 -0700)]
am
37e1052c: Add support for using custom signapk.jar.
* commit '
37e1052c99c1ba045e8d2197637055ceb4b0c308':
Add support for using custom signapk.jar.
The Android Automerger [Wed, 5 Jun 2013 22:35:01 +0000 (15:35 -0700)]
JWR66
T.R. Fullhart [Mon, 18 Mar 2013 17:31:26 +0000 (10:31 -0700)]
Add support for using custom signapk.jar.
Details:
* New --signapk_path, --extra_signapk_args, --java_path.
* New --public_key_suffix, --private_key_suffix so you can change the filenames.
* Fixes raising exceptions on error.
Change-Id: I0b7014b6d779d52ae896f95dfecb1bcccf536cf4
(cherry picked from commit
a28acc6972ce35e9dfab061f175e229859d3e4db)
Clay Murphy [Wed, 5 Jun 2013 21:00:20 +0000 (14:00 -0700)]
am
0b6a52d9: am
49d86864: docs: Adding styles needed by devices/tech/dalvik/dalvik-bytecode.html Bug:
8905394
* commit '
0b6a52d955c23ab40a1585f832a5f68b20078214':
docs: Adding styles needed by devices/tech/dalvik/dalvik-bytecode.html Bug:
8905394
Clay Murphy [Wed, 5 Jun 2013 20:56:56 +0000 (13:56 -0700)]
am
49d86864: docs: Adding styles needed by devices/tech/dalvik/dalvik-bytecode.html Bug:
8905394
* commit '
49d86864881d72a5400f35cd487fedb7b959d4ce':
docs: Adding styles needed by devices/tech/dalvik/dalvik-bytecode.html Bug:
8905394
Clay Murphy [Wed, 5 Jun 2013 18:06:02 +0000 (11:06 -0700)]
docs: Adding styles needed by devices/tech/dalvik/dalvik-bytecode.html
Bug:
8905394
Change-Id: I3a89f9da01d92efd2ea6d9900305ea16a0316d63
The Android Automerger [Wed, 5 Jun 2013 18:17:07 +0000 (11:17 -0700)]
"JSR66"
T.R. Fullhart [Wed, 5 Jun 2013 17:50:40 +0000 (17:50 +0000)]
Merge "Add support for using custom signapk.jar."
Torne (Richard Coles) [Wed, 5 Jun 2013 17:11:48 +0000 (17:11 +0000)]
Merge "Add proper deps for jarjar rules files."
The Android Automerger [Wed, 5 Jun 2013 17:00:40 +0000 (10:00 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
T.R. Fullhart [Mon, 18 Mar 2013 17:31:26 +0000 (10:31 -0700)]
Add support for using custom signapk.jar.
Details:
* New --signapk_path, --extra_signapk_args, --java_path.
* New --public_key_suffix, --private_key_suffix so you can change the filenames.
* Fixes raising exceptions on error.
Change-Id: I0b7014b6d779d52ae896f95dfecb1bcccf536cf4
The Android Automerger [Wed, 5 Jun 2013 14:51:25 +0000 (07:51 -0700)]
"AAR66"
The Android Automerger [Wed, 5 Jun 2013 14:49:32 +0000 (07:49 -0700)]
merge in master-release history after reset to master
Torne (Richard Coles) [Tue, 4 Jun 2013 15:48:13 +0000 (16:48 +0100)]
Add proper deps for jarjar rules files.
Changes to the jarjar rules file for a module were not causing
rebuilds; add the missing dependency.
Change-Id: Ib78fa708681cbc414218fe84cc2c4282c619f45f
OSDN Git Service
