tree d92555a32c692bfa61b48ba399863e39fa9e822e
parent da694a5009e5eddcfde3b734c425d91acc85b73f
parent 791507db2293a4118b407e77b205b35cd95432f5
author wangmingming1 <wangmingming1@xiaomi.com> 1512185022 +0000
committer android-build-merger <android-build-merger@google.com> 1512185022 +0000

Merge "Prevent system app upgrading from multi-arch to single-arch" am: 5cac6ed047 am: 58a0809802
am: 791507db22

Change-Id: I3e0605d8d6e9dcc6ecc68bb7af58afc3ee8f7b33