tree 1e7232cca2e07385aff4b2fca4721151fc611cba
parent 3872e56f698493011938b3b59bca48bc54995df2
parent 66ffbbfdf9489c8b5e66a3c8dbf70e12f1f9b234
author Scott Main <smain@google.com> 1471569129 +0000
committer android-build-merger <android-build-merger@google.com> 1471569129 +0000

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

Change-Id: Ib72ec2497e7b58c42ecca05cc318d7345e9fce69