tree 509a03bc525bc4f58797f4da8e5b74bd781ed045
parent acc96b79e7941a61d8ca0ec66ec02a887a3e6b1b
parent 2d7ca0c435e9acdff274d2a7817879ec44f61b45
author Joe Fernandez <joefernandez@google.com> 1389920799 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389920799 +0000

am 2d7ca0c4: am 6104a749: am 12382d13: am fcab250d: am 16fe3737: Merge "docs: Added note to Support Library Setup page: mediarouter to appcompat dependency" into klp-docs

* commit '2d7ca0c435e9acdff274d2a7817879ec44f61b45':
  docs: Added note to Support Library Setup page: mediarouter to appcompat dependency