summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorLuan Nguyen <luann@google.com>2015-02-13 00:16:48 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-02-13 00:16:48 +0000
commit474746c7b08842cefecc9c1408c7837d93cff823 (patch)
tree216ee978d413c37565be6172c5926ee492af9241 /core
parent71cf2b6d5344a45413f0c77691d7e1efb18b398f (diff)
parentfe2c687b97f21b7dd5471279c1b2b9458dcd22bf (diff)
downloadframeworks_base-474746c7b08842cefecc9c1408c7837d93cff823.zip
frameworks_base-474746c7b08842cefecc9c1408c7837d93cff823.tar.gz
frameworks_base-474746c7b08842cefecc9c1408c7837d93cff823.tar.bz2
am 2ea209ab: am 8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs
automerge: fe2c687 * commit 'fe2c687b97f21b7dd5471279c1b2b9458dcd22bf': docs: Update device art generator to include Wear generic devices.
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions