tree 32048ac166c0ac0d285758f6ed1e2462a82663f1
parent dab9a7a1029242a6d7a8250f9e9bd22ce95b84f5
parent cee5107cf6a2ba53a729e7eedc7c9c91bd27aa1b
author Scott Main <smain@google.com> 1351132980 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351132980 -0700

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

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