tree 491f53337ee358395b93ca2b34b01ee30accd829
parent 5caa10ed03bc9fa95a91edc73cd1d0c510fdf509
parent f28489b81642bd879a72437e138e356aa05176c9
author vandwalle <vandwalle@google.com> 1410577593 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410577593 +0000

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

* commit '4ae83802fb462233a5caea9e94cc2692ea84a389':
  various fixes: