OSDN Git Service

DO NOT MERGE: cherry-pick https://review.source.android.com/14536 into tools_r6.