OSDN Git Service

am 0bb2c170: Merge commit \'bb94d790\' into manualmerge
authorDirk Dougherty <ddougherty@google.com>
Thu, 23 Jan 2014 01:03:21 +0000 (17:03 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 23 Jan 2014 01:03:21 +0000 (17:03 -0800)
* commit '0bb2c1702a0ca2b174b70ac2d5364548453ba524':
  Support generated samples_toc.cs file.


Trivial merge