tree f4cf4b613e97e136cd0550f705286871041fae41
parent 0e4d2885a34d31f5dbe5a08bdb654953abaf82a2
parent 7d86b45472898373bbe3ef03286b66d71ea82b79
author Dianne Hackborn <hackbod@android.com> 1392342877 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392342877 +0000

am 7d86b454: Merge "frameworks/native: move idmap to frameworks/base"

* commit '7d86b45472898373bbe3ef03286b66d71ea82b79':
  frameworks/native: move idmap to frameworks/base