ParanoidOta 1.00

Change-Id: I53d55cea737126e9087b51012e1ca11fab64abaa
Revert "ParanoidOta 1.00"

This reverts commit 482d5b63727d8e39c57d595a650821ed77abd7c2.

Change-Id: I6e1605a83c99193c8c045d36e6bd71fd6ab63c00
3.69

Change-Id: I512d2603db556be15a0ce2bc6ba089edd5984dc4
Merge remote-tracking branch 'pa/jellybean-legacy' into sgs2

Conflicts:
	config/pa_common.mk