tree b251f46ec1742762133040b0944aa442f0a0529b
parent 37fdea969fa9e9685e9d3864055573464ff8cdbb
parent 4e51d8e6d5084a1c9133137e65a36d8e9e0c8cc1
author Scott Main <smain@google.com> 1351132845 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351132845 -0700

am 4e51d8e6: am 4810a244: am 71e20e2e: am ef4d1081: Merge "update class header for deprecated info" into jb-dev-docs

* commit '4e51d8e6d5084a1c9133137e65a36d8e9e0c8cc1':
  update class header for deprecated info