tree 66c0870086afc1cbd0c38115aa8b8264e86075a2
parent b15335142e0d3e53973a994862dd60c6cb9e812f
parent 1cb87dac3363386295e1483053563aff2e1ac989
author Dianne Hackborn <hackbod@google.com> 1282922944 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282922944 -0700

am 1cb87dac: am 4f410fb5: Update to follow API.

Merge commit '1cb87dac3363386295e1483053563aff2e1ac989'

* commit '1cb87dac3363386295e1483053563aff2e1ac989':
  Update to follow API.