OSDN Git Service

am de525b44: am 2a4f71df: Merge "Temporarily disable sample code html generation...
authorDirk Dougherty <ddougherty@google.com>
Thu, 22 Aug 2013 17:10:52 +0000 (10:10 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 22 Aug 2013 17:10:52 +0000 (10:10 -0700)
commit978ec174fbbbda4a844178f645e83365861a0d4c
tree823c63143d45f5754d5e44c3d3588fee1b3aaa54
parentfdc3c0ef90fa4b8c6130714b71b478c1e7a25a91
parentde525b442f6a0a467074ab216543c3372786139e
am de525b44: am 2a4f71df: Merge "Temporarily disable sample code html generation in docs builds." into jb-mr2-docs

* commit 'de525b442f6a0a467074ab216543c3372786139e':
  Temporarily disable sample code html generation in docs builds.
Android.mk