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

* commit 'e99b024dfc82c8f3356ad6f18429addb6d257beb':
main
Keisuke Kuroyanagi 2013-10-10 00:39:55 -07:00 committed by Android Git Automerger
commit 3c7107bf7e

Diff Content Not Available