tree 933698416ae00efae99ad870ae353e41675bf196
parent 0db6bea563c574b7b6c1d9d4c70079a4557fe464
parent 0f72571ab057bb7c11ef47567eadcbe84de4cfc5
author vandwalle <vandwalle@google.com> 1410575703 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410575703 +0000

am 8c8f56ca: am e62a18e5: Merge "various fixes:" into lmp-dev

* commit '8c8f56ca16fd9d28ea2c2bf1d4f2fe59dcb1a8a7':
  various fixes: