commit | 2799aacd62f2557b5c47be7fe061d9ce7c31ba6b | [log] [tgz] |
---|---|---|
author | Dianne Hackborn <hackbod@google.com> | Fri Oct 17 17:25:41 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 17 17:25:41 2014 +0000 |
tree | bb6ce2eb2b29af11b221f44bea86a7ffcefdfd80 | |
parent | 1875298a965a0124cba5b8418e3a9e5bc5fb7c7e [diff] | |
parent | 87fa865bea0140b49b5f46e20c64d252e8b91adf [diff] |
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.