appcelerator/titanium_mobile — pull request #6275 by jonalter (2014-10-27 17:49:39+00:00)
Title: added onCreateOptionsMenu, onPrepareOptionsMenu interfaces that are available for modules/proxies

https://jira.appcelerator.org/browse/TIMOB-15443

Resolved merge conflicts with https://github.com/mokesmokes/titanium_mobile/commit/5764a42c8d8604d17a8e994309f5293997d0b551
Conflicts:
android/titanium/src/java/org/appcelerator/titanium/TiBaseActivity.java