tree 4c7cb5a10935c7f2bc89ad95b61940f80df6cc01
parent d302732c8d54a62be9fef9ee3a3d037a8d29feeb
parent 0a5dea98597fe44bef52cb31ccb2c82be60f3d07
author Mark Goldstein <markgoldstein@google.com> 1499802966 +0000
committer android-build-merger <android-build-merger@google.com> 1499802966 +0000

Merge "Docs: Fix the doc strings for the prepareFrom* methods." into oc-support-26.0-dev
am: 0a5dea9859

Change-Id: I37ebfa99442351e537441d3217d1341bb898c273