am d8fbcb09: am 6772ad65: am eea972e5: am d5da5ecc: (-s ours) Switch to using the framework ActionBar.

* commit 'd8fbcb090e0b57fe92072ffe0785fcd5fe758c25':