OSDN Git Service

am bd4d3203: Merge "Support an ABI flag for instrumentation."
authorNarayan Kamath <narayan@google.com>
Fri, 30 May 2014 10:41:24 +0000 (10:41 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 30 May 2014 10:41:24 +0000 (10:41 +0000)
commitb9b31f4b8eda123e7b544d1a0fa886576064adca
treef08261f8c8c2458969df0c840a4789d5eb06463d
parent52b4146273ea29f6d1ed89e4de79f2d7ff0d71dc
parentbd4d320344833ce67dad3a4e10a61d0502a81d0e
am bd4d3203: Merge "Support an ABI flag for instrumentation."

* commit 'bd4d320344833ce67dad3a4e10a61d0502a81d0e':
  Support an ABI flag for instrumentation.
core/java/android/app/ContextImpl.java
services/java/com/android/server/am/ActivityManagerService.java