tree f6019f93c787068664ef0eed2db5497ea76264c4
parent 29750be9618c1c5b1b87526fbdaf1b3af485d2b9
parent f14b1d2e17ee862b84c9acb88f299984c6e969d9
author Dianne Hackborn <hackbod@google.com> 1347918247 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1347918247 -0700

am f14b1d2e: Update to follow framework.

* commit 'f14b1d2e17ee862b84c9acb88f299984c6e969d9':
  Update to follow framework.