tree 5c0453edd140c5a6fceedf3b866d891ae6faff8d
parent 2ffc2b8e5e4b6ed54bc2924a1f146b0a04f79670
parent da77cee96d33aa015f90e537ce2d06e6853aac93
author Marco Nelissen <marcone@google.com> 1366383658 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366383658 -0700

am da77cee9: Merge "Fix sample info parsing" into jb-mr2-dev

* commit 'da77cee96d33aa015f90e537ce2d06e6853aac93':
  Fix sample info parsing