am 0bb2c170: Merge commit \'bb94d790\' into manualmerge

* commit '0bb2c1702a0ca2b174b70ac2d5364548453ba524':
  Support generated samples_toc.cs file.
This commit is contained in:
Dirk Dougherty 2014-01-22 17:03:21 -08:00 committed by Android Git Automerger
commit 829e4db46f