tree 82f1d0e510190fbbe5d97a83a2905cb949a7a2ef
parent 96031a9985634e9919b1000652779f3e53a705de
parent 65a83bdf2ea1643449294a23a450e5a8a5b5058c
author Nick Kralevich <nnk@google.com> 1415641894 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415641894 +0000

am 65a83bdf: Merge "Reserve some AIDs for OEMs"

* commit '65a83bdf2ea1643449294a23a450e5a8a5b5058c':
  Reserve some AIDs for OEMs