tree c89da9ce6365c618156f432b6d08bb9962086ab7
parent 205365eb482dcb4ec86be53e2b073269c7aabf6a
parent 24cb6374df50a6ea5978fb9851e4030ac9924307
author Zach Kuznia <zork@google.com> 1443659313 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443659313 +0000

am 24cb6374: am a8f3f067: am ae8aea76: Merge "Allow manual to be read from disk" into mnc-dr-dev

* commit '24cb6374df50a6ea5978fb9851e4030ac9924307':
  Allow manual to be read from disk