summaryrefslogtreecommitdiffstats
path: root/docs/html/design
diff options
context:
space:
mode:
authorsmain@google.com <smain@google.com>2014-11-24 20:00:50 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-24 20:00:50 +0000
commitf00d46db377b97da673f8699928d8343b3bc132d (patch)
treec28b594797ee8803b27d7be8a835dc61527cc346 /docs/html/design
parent98a20f68e0f31c43d090b16e3802c67226dbd055 (diff)
parent79b496e867f15529e442bbd19f6d0a75bf3f9f38 (diff)
downloadframeworks_base-f00d46db377b97da673f8699928d8343b3bc132d.zip
frameworks_base-f00d46db377b97da673f8699928d8343b3bc132d.tar.gz
frameworks_base-f00d46db377b97da673f8699928d8343b3bc132d.tar.bz2
am 79b496e8: am 75cd7c74: am 5f3ba993: am 1b23ee96: Merge "add intro videos (w/ shadowbox) to Auto and Wear landing pages." into lmp-docs
* commit '79b496e867f15529e442bbd19f6d0a75bf3f9f38': add intro videos (w/ shadowbox) to Auto and Wear landing pages.
Diffstat (limited to 'docs/html/design')
0 files changed, 0 insertions, 0 deletions