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

* commit 'd553ea618739fcee80b6c310050d4a2d68a58af8':
main
Keisuke Kuroyanagi 2013-10-03 14:51:39 -07:00 committed by Android Git Automerger
commit fdcb329288

Diff Content Not Available