OSDN Git Service

resolve merge conflicts of c522dc6 to mnc-mr-docs am: 0cb25d527f
authorCheryl Potter <cherylpotter@google.com>
Thu, 5 May 2016 16:34:12 +0000 (16:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 5 May 2016 16:34:12 +0000 (16:34 +0000)
commitaa99efdb7290fa3dfdb06ebf756e5e6fb9ae446c
treec1ca09313dd3445eb36be26ff9fa66a19e56b881
parent35515f4fdb9e0c5ae4618a8b55addd2e24cf6983
parent34b9fa4d471a0bf2b6cf2dc8c342468d48c9fefa
resolve merge conflicts of c522dc6 to mnc-mr-docs am: 0cb25d527f
am: 34b9fa4d47

* commit '34b9fa4d471a0bf2b6cf2dc8c342468d48c9fefa':
  docs: Update help button redirects for new Android Monitor docs b/28592116

Change-Id: I24359c6e2eea97383309610f60d83286a0663c7b