Christopher Tate
596395bb8f
Clean up /system/app -> /system/priv-app in incremental builds
...
Change-Id: Ib5596532e042e11cb1227d8a33367d24a3163431
2013-06-17 14:27:03 -07:00
The Android Open Source Project
6de9dd9324
am f0db5962
: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
...
* commit 'f0db59627543ef0ae918039870de5583f5e475c9':
"JSR78"
2013-06-17 07:33:32 -07:00
The Android Open Source Project
f0db596275
Reconcile with jb-mr2-zeroday-release - do not merge
...
Change-Id: I648e611890e12e68d1be949fe474a2a5e19200a4
2013-06-17 07:31:38 -07:00
The Android Automerger
d48861fdbb
"JSR78"
2013-06-17 05:55:31 -07:00
The Android Automerger
41d8cfce96
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
2013-06-17 05:55:05 -07:00
The Android Open Source Project
87a9ce019a
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
2013-06-16 07:45:35 -07:00
The Android Open Source Project
c5ffd94171
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
...
Change-Id: I676e94de2cbbc9941fe4a895a55b2d5325babb88
2013-06-16 07:43:37 -07:00
The Android Automerger
256d71560c
"JSR77"
2013-06-16 05:56:42 -07:00
The Android Automerger
82743115e3
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
2013-06-16 05:55:16 -07:00
Jeff Brown
92081e6efc
Remove mediarouter v7 support library from SDK.
...
Bug: 9425325
Change-Id: Iba64455cf8bcf4892ff9bf10628e7b5272787a1e
2013-06-15 12:19:44 -07:00
The Android Automerger
310c2d31aa
JWR66N
2013-06-15 12:18:10 -07:00
Jeff Brown
c39063df9b
am bd1c3a21
: am 0eacd936
: Remove mediarouter v7 support library from SDK.
...
* commit 'bd1c3a2112d023e9f0aab115c64ba345c666ebe5':
Remove mediarouter v7 support library from SDK.
2013-06-14 16:43:23 -07:00
Jeff Brown
bd1c3a2112
am 0eacd936
: Remove mediarouter v7 support library from SDK.
...
* commit '0eacd936b7d6dabd380ecd6f1d25d39625b37495':
Remove mediarouter v7 support library from SDK.
2013-06-14 16:42:09 -07:00
Jeff Brown
0eacd936b7
Remove mediarouter v7 support library from SDK.
...
Bug: 9425325
Change-Id: Iba64455cf8bcf4892ff9bf10628e7b5272787a1e
2013-06-14 15:46:29 -07:00
The Android Open Source Project
640ad668e9
am 9bfdf4d5
: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit '9bfdf4d539d011f0be59370d61dcbf257b3ae578':
JWR66M
2013-06-14 12:37:53 -07:00
The Android Open Source Project
9bfdf4d539
Reconcile with jb-mr2-release - do not merge
...
Change-Id: If2d4012040805ba406dd14909d6a6773b8060eef
2013-06-14 12:32:53 -07:00
Mike Lockwood
051a1740eb
Add support for WITHOUT_CLANG
...
Change-Id: I12e776e44c69649bca34c35eff2ee7c75cfe62cd
2013-06-14 10:52:50 -07:00
The Android Automerger
3e7a208f65
JWR66M
2013-06-13 17:11:13 -07:00
The Android Open Source Project
977d5835a6
am 1e6cb5a8
: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
...
* commit '1e6cb5a8f26420bf94c6bc194d95002d9366caa4':
"JSR74"
JWR66L
JWR66K
2013-06-13 08:25:36 -07:00
The Android Open Source Project
1e6cb5a8f2
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
...
Change-Id: I986e60e5558ca20ee361e768c46692bbbfc46237
2013-06-13 08:22:30 -07:00
The Android Automerger
d6ab7c62ef
"JSR74"
2013-06-13 05:56:10 -07:00
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
0baade6562
am d8ef19b0
: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit 'd8ef19b0c8a57daea726ad93edbbe396b9e9f5d3':
JWR66J
JWR66I
2013-06-12 18:06:07 -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
951e0f1e8d
am fe365531
: am 1e1241ce
: Dist static Java library modules.
...
* commit 'fe365531b0ee363640fb50d5a230c0b999fbbe4d':
Dist static Java library modules.
2013-06-12 15:41:57 -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
8b651c799a
am 8f586805
: am 38cdd442
: Tweak proguard flags in the 2 files.
...
* commit '8f5868057c6c84760e8419792b0009cb1d133861':
Tweak proguard flags in the 2 files.
2013-06-12 11:12:04 -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
4d889727c2
am 8870070d
: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
...
* commit '8870070d426f910cc223b3ea4f2f33a1c477014a':
"JSR73"
JWR66H
2013-06-12 07:26:01 -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
cb066089c5
am 31b161ce
: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
...
* commit '31b161cedce884cb7a1426f810d4e1cba9d33f46':
"JSR72"
2013-06-11 15:37:02 -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
Torne (Richard Coles)
4297ce7d0e
Merge "Add webviewchromium to the preopt jar list."
2013-06-11 13:13:45 +00: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
c3e7c3f765
am 63452300
: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit '6345230095ac4ac7eb45c71caccd5a4b02942a8e':
JWR66G
JWR66F
JWR66E
2013-06-10 18:21:08 -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
4ed273cbc2
am 6c1d6385
: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
...
* commit '6c1d6385622798247881e8750864d17f49038e4c':
"JSR71"
"JSR70"
JWR66D
JWR66C
JWR66B
2013-06-10 11:11:50 -07:00