tree 55ed3475ec754503e7a67a76b6c7c667c220f23f
parent 4b46b0756f1a296f2e14c5ae8d6c701ef5cbf51e
parent a4c2cb77b51bc2b2faa615e8a6bfa20f24998269
author Raphael Moll <raphael@google.com> 1331580724 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1331580724 -0700

am a4c2cb77: am af574136: Support lib: use /samples directory. do not merge.

* commit 'a4c2cb77b51bc2b2faa615e8a6bfa20f24998269':
  Support lib: use /samples directory. do not merge.