tree 400af497b3b8e61af5bb986a38cddfdec08c09ba
parent c0c286366a234c5da6f3687c24b6d52154d43fa9
parent f086fd33c03d16c62f161bc9abca8fdeba8487ae
author Adam Powell <adamp@android.com> 1355269375 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1355269375 -0800

am f086fd33: am 2008690a: Merge "Add compatibility implementation of ActivityOptions and start activity."

* commit 'f086fd33c03d16c62f161bc9abca8fdeba8487ae':
  Add compatibility implementation of ActivityOptions and start activity.