am 147372fd: resolved conflicts for merge of 67d8bd66 to lmp-mr1-dev-plus-aosp

* commit '147372fdf9fae688114121228247497d43514ab7':
This commit is contained in:
Lajos Molnar 2014-09-19 13:33:22 +00:00 committed by Android Git Automerger
commit 6c442e264d

Diff Content Not Available