tree 4600885a12bbeedbbd4db667ddd62e248326913c
parent 797165083596b362c9db38ba49a5a428ede88c41
parent 3be230a48b9e386e9d516078d556bdf7fa521132
author Conrad Chen <conradchen@google.com> 1492812125 +0000
committer android-build-merger <android-build-merger@google.com> 1492812125 +0000

Merge "Block modification to ID and package name" into oc-dev
am: 3be230a48b

Change-Id: Ia1479270eab980b4d43a4b3a4a7ed8274e41bc5e