FDB
Signed-off-by: Kristofer Ard <kristoferard@gmail.com>
Merge branch 'jb-mr2' of github.com:AndroidCommander/platform_manifest into jb-mr2