From: Dirk Dougherty <ddougherty@google.com>
Date: Mon, 3 Nov 2014 22:35:52 +0000 (+0000)
Subject: am eb75cdae: am 04a95647: am 792fb0e6: am 4244929f: Merge "Doc change: increment... 
X-Git-Tag: android-x86-6.0-r1~144^2~428
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=94ed49c75efe12e7b2027249aa4cf12d52e8d921;p=android-x86%2Fbuild.git

am eb75cdae: am 04a95647: am 792fb0e6: am 4244929f: Merge "Doc change: increment the json import versions in docfile." into lmp-docs

* commit 'eb75cdae67975ed183493fff96ae398a36e74bea':
  Doc change: increment the json import versions in docfile.
---

94ed49c75efe12e7b2027249aa4cf12d52e8d921