tree 1d17a46164c48cd61140b0be6b06878734639588
parent d31e637886ac2876448770b9aed3ffd819f91fd9
parent d4f152b922e80986df56c4fa0df48b60e139c858
author Mark Lu <marklu@google.com> 1472517827 +0000
committer android-build-merger <android-build-merger@google.com> 1472517827 +0000

Merge "Merge "docs: fix link in Loader reference page" into nyc-dev am: 3c638c1ea1 am: 09e4d9bada" into nyc-mr1-dev-plus-aosp
am: d4f152b922

Change-Id: Ie160cc9531c3facd954e6c6790673b406046c70b