tree d423ee03899233521cce8eaee85e8748f5ba2520
parent 6d8b3b1418a764db42cd6d0929bf7829032d0f59
parent a2bbdb96303c0fcac696ece07c27a49fbdd1f740
author Joe Fernandez <joefernandez@google.com> 1425347692 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425347692 +0000

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

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