tree 15842ceb46e37bd59b345d9edda1f0342eacd8c7
parent 4317ab134b1c46d23429f3a92c4ecd5a4d385b8e
parent 96a99bc3c1f57298c551254fcb8854410ff4e53f
author Luan Nguyen <luann@google.com> 1423787609 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423787609 +0000

am 96a99bc3: am b9f9408c: am 474746c7: am 2ea209ab: am 8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs automerge: fe2c687

* commit '96a99bc3c1f57298c551254fcb8854410ff4e53f':
  docs: Update device art generator to include Wear generic devices.