summaryrefslogtreecommitdiffstats
path: root/keystore
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2014-12-02 23:19:28 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-02 23:19:28 +0000
commit0cd6296c0afb92f63487247ef4c9c73715113926 (patch)
tree15d5cc629f36afca6a9e6c3d07228ec57ee8a74e /keystore
parent24d40b302e5dabc6c435b6549ef5801540edfca8 (diff)
parent63c7a655beab21da934d21bb4004889bfb6e4417 (diff)
downloadframeworks_base-0cd6296c0afb92f63487247ef4c9c73715113926.zip
frameworks_base-0cd6296c0afb92f63487247ef4c9c73715113926.tar.gz
frameworks_base-0cd6296c0afb92f63487247ef4c9c73715113926.tar.bz2
am 63c7a655: am 1b33396e: Merge "Deprecate Resources.getDrawable(int) in favor of the two-arg version" into lmp-mr1-dev
* commit '63c7a655beab21da934d21bb4004889bfb6e4417': Deprecate Resources.getDrawable(int) in favor of the two-arg version
Diffstat (limited to 'keystore')
0 files changed, 0 insertions, 0 deletions