tree c58ca9affbdf2639798a8a2fa8766822478a4359
parent 4c073b965e3cf8ae91b6f6009811c1b6d364b345
parent 0663d1d90dc943e8bfaadb27f270f600d7d2e0a0
author Tom Taylor <tomtaylor@google.com> 1261445080 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1261445080 -0800

am 0663d1d9: am fd1e757f: Update imports to android-common

Merge commit '0663d1d90dc943e8bfaadb27f270f600d7d2e0a0'

* commit '0663d1d90dc943e8bfaadb27f270f600d7d2e0a0':
  Update imports to android-common