summaryrefslogtreecommitdiffstats
path: root/preloaded-classes
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2015-01-05 21:50:18 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-01-05 21:50:18 +0000
commit7768fd2f8e412f87300882bfa5f205944425fd0f (patch)
tree62f0974986fa773305591f3c6bd325b3e7eeaaac /preloaded-classes
parentafeb044afc0d62f67bba7c4f2fd959627fef9f06 (diff)
parent74882cb0e3810ab1d77bc85a9ed1fa2b024a0159 (diff)
downloadframeworks_base-7768fd2f8e412f87300882bfa5f205944425fd0f.zip
frameworks_base-7768fd2f8e412f87300882bfa5f205944425fd0f.tar.gz
frameworks_base-7768fd2f8e412f87300882bfa5f205944425fd0f.tar.bz2
am bf80d273: am 74890242: Merge "Don\'t override dialog icon drawable unless valid resource ID was set" into lmp-mr1-dev
automerge: 74882cb * commit '74882cb0e3810ab1d77bc85a9ed1fa2b024a0159': Don't override dialog icon drawable unless valid resource ID was set
Diffstat (limited to 'preloaded-classes')
0 files changed, 0 insertions, 0 deletions