tree 661e9d4ef59589327199d1d2961c86daab94fcd7
parent fac17cc7b1e8c3b73a457c2d85e2f832461fb26e
parent 50756cccc05b77be0d19506a891415d192282db7
author Katie McCormick <kmccormick@google.com> 1379969439 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379969439 -0700

am 50756ccc: am 77364631: am a9fcf662: Merge "New Scheduling class." into jb-mr2-docs

* commit '50756cccc05b77be0d19506a891415d192282db7':
  New Scheduling class.