android-5.0.0_r6 -> android-5.0.0_r7

Change-Id: I1277d9a20101bed3200fafee530c8662291455f8
Launcher3 -> Trebuchet

Change-Id: I3b77b7d0e5289b567c6a1dfe7cd14f1d4372e487
Comment out CMHome, for now.

Trebuchet does not have any CMHome patches ported, and CMHome breaks
DashClock or Chronus installation due to changes in how duplicate
permissions are handled in Lollipop. Remove for now.

Change-Id: I38990b4e1a8b5e09ffe7e18a23f2bf431495a322
android: enable cmfm and external dependencies

Change-Id: I0b2fca8c13262087a8e5d801b928cc483470abf2
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Switch to Mms-caf

Change-Id: Ic3d143c4304f17a2aea3ce43b19214641ade13ad
Enable FFMPEG and Stagefright plugins

Change-Id: Ia41715481d70040f9aa53c2a1cd080758ef4e96f
Add Gmock

Change-Id: I047d6cfae642be3b6d71b2fb29a265f9338d7ad9
Use our OpenSSL repo

Change-Id: I768d6c06120860ac411e0241880cc90dc20e27b0
5.0.0_r7 -> 5.0.1_r1

Change-Id: Icbd514cd6ba12a86d369b1ae55599720da16afb1
Merge remote-tracking branch 'upstream/cm-12.0' into HEAD

Conflicts:
	default.xml

Change-Id: I5384d169df0284443d4e06a0d6b4af4f54232b67