The Android Automerger
e287119390
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
2013-06-13 05:55:11 -07:00
The Android Automerger
8168ebb464
JWR66L
2013-06-12 23:25:14 -07:00
The Android Automerger
8a9f5ca3b7
JWR66K
2013-06-12 20:52:33 -07:00
The Android Open Source Project
d8ef19b0c8
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I3dff434f8e95a5c15b4ef4bca3c05bdfa163df0e
2013-06-12 18:03:58 -07:00
The Android Automerger
42cd97bbeb
JWR66J
2013-06-12 17:06:04 -07:00
Ying Wang
fe365531b0
am 1e1241ce: Dist static Java library modules.
...
* commit '1e1241ce3d4259bcc4a0039ed68fc5b3fc8069b5':
Dist static Java library modules.
2013-06-12 15:38:05 -07:00
Ying Wang
1e1241ce3d
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
2013-06-12 15:29:38 -07:00
The Android Automerger
8864c28634
JWR66I
2013-06-12 14:26:14 -07:00
Ying Wang
8f5868057c
am 38cdd442: Tweak proguard flags in the 2 files.
...
* commit '38cdd4429f23d9a0d27a6d8cfe318c29b604afbf':
Tweak proguard flags in the 2 files.
2013-06-12 11:09:33 -07:00
Ying Wang
38cdd4429f
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
2013-06-12 11:04:49 -07:00
The Android Open Source Project
8870070d42
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
...
Change-Id: I9f012993eb7dccac74fec611f0ea1c8dcd71d93f
2013-06-12 07:23:10 -07:00
The Android Automerger
fba3d4e98f
"JSR73"
2013-06-12 05:56:41 -07:00
The Android Automerger
625956b9ef
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
2013-06-12 05:55:47 -07:00
The Android Automerger
d6da9bb65e
JWR66H
2013-06-11 17:39:53 -07:00
The Android Open Source Project
31b161cedc
Reconcile with jb-mr2-zeroday-release - do not merge
...
Change-Id: I40a07d0eebc9a1ff517241b9788f30c047a62692
2013-06-11 14:56:40 -07:00
The Android Automerger
b6a48228f9
"JSR72"
2013-06-11 05:56:01 -07:00
The Android Automerger
6b1c32c580
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
2013-06-11 05:55:07 -07:00
The Android Open Source Project
6345230095
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I9644ec405e9bd0ce498ab424f5f38cf2920ea1d6
2013-06-10 18:19:13 -07:00
The Android Automerger
337ee5bc59
JWR66G
2013-06-10 16:45:28 -07:00
The Android Automerger
3fbee5a1b5
JWR66F
2013-06-10 16:07:05 -07:00
The Android Automerger
1104a5012d
JWR66E
2013-06-10 15:16:12 -07:00
The Android Open Source Project
6c1d638562
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
...
Change-Id: I80cacfe6593b8595da9df2827790fc763c1a25ee
2013-06-10 08:13:29 -07:00
The Android Automerger
b2b3db347f
"JSR71"
2013-06-10 05:55:35 -07:00
The Android Automerger
0b157b8f29
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
2013-06-10 05:55:03 -07:00
The Android Automerger
565af6a260
"JSR70"
2013-06-09 05:56:51 -07:00
The Android Automerger
e1cca6e567
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
2013-06-09 05:55:22 -07:00
The Android Automerger
dd4fad0ce9
JWR66D
2013-06-07 15:13:44 -07:00
The Android Automerger
c8647435bf
JWR66C
2013-06-06 16:42:07 -07:00
The Android Automerger
664a0bbe48
JWR66B
2013-06-06 15:09:23 -07:00
The Android Open Source Project
f2d5533e87
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
...
Change-Id: I23c04c52ecd129d541eaaf3a3a597e5533a6bc59
2013-06-06 10:36:58 -07:00
The Android Automerger
bdcb7fcde2
"JSR67"
2013-06-06 05:56:22 -07:00
The Android Automerger
0d0ae245c2
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
2013-06-06 05:55:18 -07:00
T.R. Fullhart
cfe8d12213
am 37e1052c: Add support for using custom signapk.jar.
...
* commit '37e1052c99c1ba045e8d2197637055ceb4b0c308':
Add support for using custom signapk.jar.
2013-06-05 16:36:49 -07:00
The Android Automerger
afeb5b4779
JWR66
2013-06-05 15:35:01 -07:00
T.R. Fullhart
37e1052c99
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 a28acc6972
2013-06-05 22:17:59 +00:00
Clay Murphy
0b6a52d955
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
2013-06-05 13:56:56 -07:00
Clay Murphy
49d8686488
docs: Adding styles needed by devices/tech/dalvik/dalvik-bytecode.html
...
Bug: 8905394
Change-Id: I3a89f9da01d92efd2ea6d9900305ea16a0316d63
2013-06-05 12:06:06 -07:00
The Android Automerger
dccc4ba344
"JSR66"
2013-06-05 11:17:07 -07:00
The Android Automerger
731ca0eaa2
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
2013-06-05 10:00:40 -07:00
The Android Automerger
1ce7555733
JWR65
2013-06-04 11:54:20 -07:00
The Android Open Source Project
e2fe6c041f
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I1168e923d0907bf1888bc2f894f7addfb559ca61
2013-06-03 16:43:33 -07:00
The Android Automerger
3f7da79c4e
JWR64B
2013-06-03 15:51:04 -07:00
The Android Open Source Project
20f6c310c7
Reconcile with jb-mr2-release - do not merge
...
Change-Id: Ibaec6294f3598d965dba72d39859f24a76c8933b
2013-06-03 14:02:22 -07:00
The Android Automerger
8c5d8a6f94
"JWR64"
2013-06-03 05:55:38 -07:00
The Android Automerger
824a388645
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-06-03 05:55:04 -07:00
The Android Automerger
b63470ae5b
"JWR63"
2013-06-02 05:56:48 -07:00
The Android Automerger
57bcbfa21d
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-06-02 05:55:14 -07:00
The Android Automerger
c41c56b4eb
JWR60E
2013-05-31 13:41:15 -07:00
The Android Automerger
99ffbcf0f6
JWR60D
2013-05-30 19:02:55 -07:00
The Android Automerger
57bb5d4950
JWR60C
2013-05-30 15:26:43 -07:00
