tree df9ce4e96d7738ccf6cadfadd3a8306c6a4260f8
parent e5bde8e03574a17fea7c078ee00fb882eb3ec829
parent 227615eeb7b6008e18d2b205cadccf4943a82e94
author kmccormick <kmccormick@google.com> 1371090538 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1371090538 -0700

am 227615ee: am bf370185: Doc update: restoring deprecation messages

* commit '227615eeb7b6008e18d2b205cadccf4943a82e94':
  Doc update: restoring deprecation messages