summaryrefslogtreecommitdiffstats
path: root/docs/html/guide
diff options
context:
space:
mode:
authorRich Slogar <rslogar@google.com>2015-02-18 00:11:42 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-02-18 00:11:42 +0000
commit6cdde6718c36851e136e7358ba2ac1fd32f6aae5 (patch)
treece4bd9f2866d6517d7a47f52fd177dbd965049c3 /docs/html/guide
parentffaee8bda9c8d22af17098fec0e6626301d91844 (diff)
parentc694604ec58fc16f2526c8689b0def0fbcfb6fc7 (diff)
downloadframeworks_base-6cdde6718c36851e136e7358ba2ac1fd32f6aae5.zip
frameworks_base-6cdde6718c36851e136e7358ba2ac1fd32f6aae5.tar.gz
frameworks_base-6cdde6718c36851e136e7358ba2ac1fd32f6aae5.tar.bz2
am 43fb9e42: am 3c3b780c: Merge "docs: studio mipmap update" into lmp-docs
automerge: c694604 * commit 'c694604ec58fc16f2526c8689b0def0fbcfb6fc7': docs: studio mipmap update
Diffstat (limited to 'docs/html/guide')
0 files changed, 0 insertions, 0 deletions