am 3e01968a: am fdcb3292: am d553ea61: am f158a6b0: am 9bea8bf6: am a5519619: am e168a3c2: Merge "Adding additional feature settings."

* commit '3e01968a37d80f6f93eceeddf0979eb2d2ca5f78':
main
Keisuke Kuroyanagi 2013-10-03 17:02:54 -07:00 committed by Android Git Automerger
commit ed6b293d9b

Diff Content Not Available