tree 49d8feb544b8eba2abc1d662a7e1c45b721c31ee
parent 4cb6d10d5e7d7b21a1d9ee2d0b69c7a34f86503c
parent cc08e619d6a946b58b2aae857e3190b5996c07b8
author Joe Fernandez <joefernandez@google.com> 1418357683 +0000
committer android-build-merger <android-build-merger@google.com> 1418357683 +0000

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

* commit 'cc08e619d6a946b58b2aae857e3190b5996c07b8':
  docs: platform updates for api 21