tree f3f1b72a294eb8194ed7c00543562a41d1731aa5
parent d34eebeed58fb2cfb607f9eef469d02adc8dbada
parent f8adc1c1013a232a4e701f238e411cf27125c4fa
author Andreas Gampe <agampe@google.com> 1473206052 +0000
committer android-build-merger <android-build-merger@google.com> 1473206052 +0000

Merge changes from topic 'cherry_pms_installd' am: 59ac10df3a am: 9756df8e85
am: f8adc1c101

Change-Id: I81533e7e035c3e94ad0388b142da7610454d4b71