tree cba62d0d64153aa2169651696bc238591341d679
parent 47f75d940e314a6eb15cf40b92bc06a29665b9e4
parent 465606c29c9d512f2e473ecba35fbd1accda5c58
author Derek Prothro <dprothro@google.com> 1414085535 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085535 +0000

am 465606c2: am 98245209: am fa071f93: Merge "Bind the workspace synchronously if started on -1 screen." into jb-ub-now-kermit

* commit '465606c29c9d512f2e473ecba35fbd1accda5c58':