tree dc2db79f490bc2e334c6e3688e099c98e846f381
parent baa73b056cbd4627a84b39a6267065ae56677220
author Andreas Gampe <agampe@google.com> 1415681647 -0800
committer Andreas Gampe <agampe@google.com> 1415683792 -0800

resolved conflicts for merge of 1d03b816 to lmp-mr1-dev-plus-aosp

(cherry picked from commit 1272887050a269d6d506b42099c2857847ad100b)

Change-Id: Ib673768fe5fc03615626ef4b10590e5317f22172