tree dde9a92a46eb7aae498adb445126ed42aad2ba94
parent 0a6305b75f9dc52d031fda90df17bff12ae78b82
parent 8d37456987246f95ab66d81658445c5ac319fb88
author Scott Main <smain@google.com> 1341012989 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1341012989 -0700

am 8d374569: am ef2b7fa2: Merge "docs: move FAQ and old notepad tutorial to other places where we can properly redirect. This way the docs are accessible from existing links and they at least appear with a sidenav Also resolve a bunch of links to the notepad docs." in

* commit '8d37456987246f95ab66d81658445c5ac319fb88':
  docs: move FAQ and old notepad tutorial to other places where we can properly redirect. This way the docs are accessible from existing links and they at least appear with a sidenav Also resolve a bunch of links to the notepad docs.