tree ce7238fb919c20be91a434730be79114c44ea2e3
parent fe0edcb20f73d06f88ea684d10122750cb88664b
parent 323bc1149d1ce235b2bc5f82eabe838f22a7cccc
author Tyler Gunn <tgunn@google.com> 1406739798 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1406739798 +0000

am b713b565: am b6a10ce2: am 85c114df: Merge "Various changes." into lmp-dev

* commit 'b713b565c404831d6d5a8914d4487094a263698a':
  Various changes.