tree 1ae372de7e259db46300a4268af7bba888c4ea35
parent d93afe16c723ad1d5d5c5f9ab5416dc02770bc70
parent e808a4b6b25b9012e2a7d35d178bc37701cae8b8
author Jeff Brown <jeffbrown@google.com> 1364958517 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1364958517 -0700

am e808a4b6: Update after API refactoring.

* commit 'e808a4b6b25b9012e2a7d35d178bc37701cae8b8':
  Update after API refactoring.