tree 11897358ca90d547a6f32872e9cfedc764545b1a
parent 114616b27dd4f3da313e933a51980e68f5c5cce7
parent 4ede13e1f5832eaaca971c4892e03a27b3b58415
author Alan Viverette <alanv@google.com> 1509569071 +0000
committer android-build-merger <android-build-merger@google.com> 1509569071 +0000

Merge "Federate platform docs against support library API file" into stage-aosp-master
am: 4ede13e1f5  -s ours

Change-Id: Id389db628eb0eb307e6401323b41612e4f89b1de