tree ff7d269f2a12547c456f4d6a36f444fa4dcba712
parent 4b49035055487058cb0f82db6eb8b3ec740934d8
parent 6c93927dd390abcf0e6254a38ef2c0f14fc1a51e
author Shawn Willden <swillden@google.com> 1429035824 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429035824 +0000

am 6c93927d: am 4827279c: Merge "Add KM_ORIGIN_UNKNOWN."

* commit '6c93927dd390abcf0e6254a38ef2c0f14fc1a51e':
  Add KM_ORIGIN_UNKNOWN.