tree c2c06892cfa76053b4b32c222729ce8065a1dacb
parent 09ba82a3b1d0bea6f02c9f7d494f22331323d275
parent 52fe06327ad019ab90139fd3755f67e0113a6ff5
author Yohann Roussel <yroussel@google.com> 1440652347 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440652347 +0000

am 52fe0632: (-s ours) am ae03b007: am 1396cdeb: am 72353f83: resolved conflicts for merge of ab01c96b to lmp-mr1-dev

* commit '52fe06327ad019ab90139fd3755f67e0113a6ff5':