tree a320ef1683f5068fc874d5df1ba70ee4cef4f321
parent ef4a94d96ba9e3cf8d26d029bb19209fd2b54cd6
parent f954060c0d9d94217127d95e416daa516733042d
author Yohann Roussel <yroussel@google.com> 1517842748 +0000
committer android-build-merger <android-build-merger@google.com> 1517842748 +0000

Fix installation on some JB am: 38be0f4882 am: 84362fa835
am: f954060c0d

Change-Id: Ibb4d500616caa5e6c1f4a88caa78726d896f2b3e