tree 66efba07adcb948d6a14af641bb1457b8719913d
parent fd30a0e7b747eb4b781ef8def3008626f14eddfe
parent c8a045d451522adab5226b0063f3a15d34542bf7
author Narayan Kamath <narayan@google.com> 1398941003 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398941003 +0000

am c8a045d4: am 41f40581: Merge "Fix x86 build in app_process."

* commit 'c8a045d451522adab5226b0063f3a15d34542bf7':
  Fix x86 build in app_process.