tree 1850284e3936ad31a575b93a4ba8b1c02801f266
parent e54ab91fff647533dcfd68c6fa284cd3642744df
parent 66b4366e99f561766303e539d3ee798a0b8a2a09
author Joe Fernandez <joefernandez@google.com> 1425348051 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425348051 +0000

am 66b4366e: am a2bbdb96: am 2ba57444: Merge "docs: update Android docs build to include API 22, Android 5.1" into lmp-mr1-dev

* commit '66b4366e99f561766303e539d3ee798a0b8a2a09':
  docs: update Android docs build to include API 22, Android 5.1