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

* commit 'fdcb3292882758ba17dff584b8eb93aee40614b5':
main
Keisuke Kuroyanagi 2013-10-03 16:09:53 -07:00 committed by Android Git Automerger
commit 3e01968a37

Diff Content Not Available