tree d3995dd00245a4e3ac13e31c3199e5d0a7a86b59
parent 7b03d10f58453873e1527384e9cdc579858d9d67
parent a8f3f067b672a8e055e76beee300cc2b1a8bea31
author Zach Kuznia <zork@google.com> 1443659038 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443659038 +0000

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

* commit 'a8f3f067b672a8e055e76beee300cc2b1a8bea31':
  Allow manual to be read from disk