tree 214ff4a4b4dfed99d0a4e15909e543c700947daa
parent 4f2d02fb0073c4129957c0d2ac6e0c0055f4dad8
parent 577570f29919da32e2b616dbab1e52fadabcb315
author Joe Fernandez <joefernandez@google.com> 1392250382 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392250382 +0000

am 577570f2: am e5dc0c39: am 5b97ec6f: am 3885b00a: am f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs

* commit '577570f29919da32e2b616dbab1e52fadabcb315':
  MediaRouter Developer Guide