tree 9cbe13234e5f3fa855f3e00e2e6bb3864121f9ec
parent 0159c6194f4ad6f2e06d685044d67cfa9de7be9c
parent bf142e6b846d86d4dcf75a51cfb84c2495291bae
author Dirk Dougherty <ddougherty@google.com> 1379003867 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379003867 -0700

am bf142e6b: am 16dae599: am 834ba474: am 4c6cde54: am 89579294: Merge "Pass whitelist of sample groups to doclava." into jb-mr2-docs

* commit 'bf142e6b846d86d4dcf75a51cfb84c2495291bae':
  Pass whitelist of sample groups to doclava.