tree 85c004b3d991e13f9afd811d57a459edeb6b5173
parent 97fd094458e25e1f500fb197e328f99ae8e6a0df
parent 97d6427ab06df8af39658fc16cec6b34bb4bdd31
author Scott Main <smain@google.com> 1471613354 +0000
committer android-build-merger <android-build-merger@google.com> 1471613354 +0000

Merge "fix redirect for AIDL doc bug: 5967288" into nyc-dev am: 66ffbbfdf9
am: 97d6427ab0

Change-Id: Ic8a4e3c86fed503333e6f46d62ad4fd492430547