tree 6629cb16c1f8ca27f9fe85b63e78537b15be2fb6
parent 5d84789a68a96237efad9e911dfd97c8d4a85103
parent 13ce376eea001a9942dc418323c3fd2980cbf299
author Trevor Johns <trevorjohns@google.com> 1415820900 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415820900 +0000

am 13ce376e: am dff4d5d4: Merge "Add two new samples." into lmp-docs

* commit '13ce376eea001a9942dc418323c3fd2980cbf299':
  Add two new samples.