tree ed3d3ce4e773a55066629f00478ce1646179c68c
parent b361a17f26f677ff7d73992982d58b6a2eaaa38d
parent 829e4db46fc5ea3816b7d6432b9bacb96cb68294
author Dirk Dougherty <ddougherty@google.com> 1390439174 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1390439174 +0000

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

* commit '829e4db46fc5ea3816b7d6432b9bacb96cb68294':
  Support generated samples_toc.cs file.