OSDN Git Service

Merge "Federate platform docs against support library API file" into stage-aosp-master
authorAlan Viverette <alanv@google.com>
Wed, 1 Nov 2017 20:44:31 +0000 (20:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 1 Nov 2017 20:44:31 +0000 (20:44 +0000)
commite8bb602327e054ad6d0010e8253b0e78acdfb16c
tree11897358ca90d547a6f32872e9cfedc764545b1a
parent114616b27dd4f3da313e933a51980e68f5c5cce7
parent4ede13e1f5832eaaca971c4892e03a27b3b58415
Merge "Federate platform docs against support library API file" into stage-aosp-master
am: 4ede13e1f5  -s ours

Change-Id: Id389db628eb0eb307e6401323b41612e4f89b1de