tree 84026468b26fb46a6d2d8a9c898ab68b747509d8
parent db9ad2da9efbd5aa614f72a820edf6c1b1cfaf4b
parent 4810a2440c5b9a890f653602164c72c8d0e86750
author Scott Main <smain@google.com> 1351132731 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351132731 -0700

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

* commit '4810a2440c5b9a890f653602164c72c8d0e86750':
  update class header for deprecated info