tree bb6ce2eb2b29af11b221f44bea86a7ffcefdfd80
parent 1875298a965a0124cba5b8418e3a9e5bc5fb7c7e
parent 87fa865bea0140b49b5f46e20c64d252e8b91adf
author Dianne Hackborn <hackbod@google.com> 1413566741 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413566741 +0000

am 87fa865b: am 374712c5: Merge "Move up to API 21, Lollipop MR1." into lmp-mr1-dev

* commit '87fa865bea0140b49b5f46e20c64d252e8b91adf':
  Move up to API 21, Lollipop MR1.