Skip to content
Commit 306f0eb6 authored by Adam Lesinski's avatar Adam Lesinski Committed by Android Git Automerger
Browse files

am 22bfb75e: am 0f0e85a6: Merge "AAPT: attributes showing up after v21... 

am 22bfb75e: am 0f0e85a6: Merge "AAPT: attributes showing up after v21 attributes would be removed for pre-21 devices" into lmp-mr1-dev automerge: 465d1234

* commit '22bfb75e':
  AAPT: attributes showing up after v21 attributes would be removed for pre-21 devices
parents d2e1ee09 22bfb75e
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment