tree 37bb6aa1b7a15d3c45a06914e44f088cc4f2941b
parent 4308c2aea45a4780b460734ee8634d74205c15c5
parent accf0770306419773c3119eb32ca912077894b11
author Shanea King-Roberson <kingroberson@google.com> 1423601457 +0000
committer android-build-merger <android-build-merger@google.com> 1423601457 +0000

am 24513bc5: am 31622894: am c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs automerge: 696b68c
automerge: accf077

* commit 'accf0770306419773c3119eb32ca912077894b11':
  Adding videos for 5.0 changes and watch face development.