tree a3237e41802436f35cc37987a364f17c4fa485d7
parent 61463a50212f16eb3dcba660e8829311f446f44d
parent 3db3fcd9200c2bb4e6e5f58ff51213caf69d1e97
author Tyler Gunn <tgunn@google.com> 1406738498 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1406738498 +0000

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

* commit 'b6a10ce2e9e8d27d079eb18055f9527f2a9c5cbc':
  Various changes.