tree 9b790c77cde32099fcd77375116ac4d867e7be00
parent 3e42bb70e4c0f358d08142e2f7f40150ff4f8cae
parent 11fc651aefbcdebc646f347e4981204d3ef7b0a7
author Joe Fernandez <joefernandez@google.com> 1418358082 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418358082 +0000

am 11fc651a: am 07877955: am 5c518b7f: am b32987ec: am c3daed96: Merge "docs: platform updates for api 21" into lmp-docs automerge: cc08e61

* commit '11fc651aefbcdebc646f347e4981204d3ef7b0a7':
  docs: platform updates for api 21