The Android Open Source Project ffb54540a7 am e2fe6c04: (-s ours) Reconcile with jb-mr2-release - do not merge ... * commit 'e2fe6c041f65faf3279b663b4392f934b898a85b': JWR64B		2013-06-03 17:16:34 -07:00
core	Merge "Tweak proguard flags in the 2 files."	2013-05-31 15:24:56 +00:00
libs/host	Move pseudolocalize to aapt	2013-04-26 14:40:41 +01:00
target	am cc9c2135: am 2e619b7c: Revert "Add the sepolicy.version file to the root directory."	2013-05-20 16:35:32 -07:00
tools	am a422266b: am 9016d0ae: Merge "Fix signing process for SELinux file_contexts" into jb-mr2-dev	2013-05-29 15:30:23 -07:00
.gitignore	…
CleanSpec.mk	Bump up to API 18 to match jbmr2.	2013-04-30 14:47:15 -07:00
buildspec.mk.default	Add WITH_ART	2013-05-22 10:49:57 -07:00
envsetup.sh	Add missing adbOptions in runhat.	2013-05-20 16:30:10 -07:00