am 967b361c: am 6ad5b4f6: Merge "Fix issue #6426645: API REVIEW:...
am 967b361c: am 6ad5b4f6: Merge "Fix issue #6426645: API REVIEW: android.app.ActivityOptions" into jb-dev
* commit '967b361c':
Fix issue #6426645: API REVIEW: android.app.ActivityOptions