tree a5c7a76f4414ec753acd69e9cc4e869c396101f8
parent 57421b1ccf835cd6de608afc94fecddcfad28a0c
parent 4254ac017240c201323964864f88fb3823b32f6c
author Dirk Dougherty <ddougherty@google.com> 1415658610 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415658610 +0000

am 4254ac01: am 56d190c4: am f253fe3e: am 602c63f8: Merge "Add Nexus 6 and Nexus 9 to the device framer." into lmp-docs

* commit '4254ac017240c201323964864f88fb3823b32f6c':
  Add Nexus 6 and Nexus 9 to the device framer.