am a5519619: am e168a3c2: Merge "Adding additional feature settings."

* commit 'a55196199efb21358feb8925c9e351b8228aca8f':
main
Keisuke Kuroyanagi 2013-09-26 05:23:24 -07:00 committed by Android Git Automerger
commit 9bea8bf671

Diff Content Not Available