tree a158aa507d9bffda30970a12271c7c627065ae50
parent 1a13c317627996234a1dfa2c0736733bd1c4c696
parent ef4d10811ae7949357cffcd9aa1dda93c2a582ca
author Scott Main <smain@google.com> 1351132396 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351132396 -0700

am ef4d1081: Merge "update class header for deprecated info" into jb-dev-docs

* commit 'ef4d10811ae7949357cffcd9aa1dda93c2a582ca':
  update class header for deprecated info