OSDN Git Service

resolve merge conflicts of c522dc6 to mnc-mr-docs
authorCheryl Potter <cherylpotter@google.com>
Thu, 5 May 2016 02:39:07 +0000 (19:39 -0700)
committerCheryl Potter <cherylpotter@google.com>
Thu, 5 May 2016 02:46:50 +0000 (19:46 -0700)
commit0cb25d527f4ca81910feb106cca7ca156a34018b
tree2da219b9af917fbe0d92df06f8f4f0f929ddcf07
parent084d99bfd4938689e6394a8f3bcb5d261b852f93
parentc522dc65c419145119217bfa6bfae127afe0829d
resolve merge conflicts of c522dc6 to mnc-mr-docs

Change-Id: Ib4aedad4813a7973268239957b5103642941733d
docs/html/_redirects.yaml