summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2014-12-16 01:43:16 +0000
committerandroid-build-merger <android-build-merger@google.com>2014-12-16 01:43:16 +0000
commit22bfb75ebb949ff05d34ad22fbcc888582aaaaa4 (patch)
treedcf12a59cc9555618478515a7fb3f2571a8ff4b7 /core/java
parent4800de0f7ce810f57db4259a6f6a7d02484800ea (diff)
parent465d123464eadf180b618164b2ed23702bca3d86 (diff)
downloadframeworks_base-22bfb75ebb949ff05d34ad22fbcc888582aaaaa4.zip
frameworks_base-22bfb75ebb949ff05d34ad22fbcc888582aaaaa4.tar.gz
frameworks_base-22bfb75ebb949ff05d34ad22fbcc888582aaaaa4.tar.bz2
am 0f0e85a6: Merge "AAPT: attributes showing up after v21 attributes would be removed for pre-21 devices" into lmp-mr1-dev
automerge: 465d123 * commit '465d123464eadf180b618164b2ed23702bca3d86': AAPT: attributes showing up after v21 attributes would be removed for pre-21 devices
Diffstat (limited to 'core/java')
0 files changed, 0 insertions, 0 deletions