tree 3ce3eba934f819992e28d01565658fe110267ba5
parent d97f1fd3cd8a7b7a1d899a2b959bbf3a525ddc7c
parent 37abc6e23e96cae3eb622b1c8983a12153ce16eb
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