OSDN Git Service

am d00d2ff2: (-s ours) am 57933834: Merge "Fix Tests after cherry picks. [DO NOT...
authorDeepanshu Gupta <deepanshu@google.com>
Thu, 2 Oct 2014 08:51:02 +0000 (08:51 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 2 Oct 2014 08:51:02 +0000 (08:51 +0000)
commitba526a288811bc6520ad9a70d57e7ef774bbb802
treebaebddb5d6824ad36e966f36c244b0a75b70bce4
parenta9787de33c703fbfbb89b02d9d3d5642305084f8
parentd00d2ff2079ca4e77173e3389834416494c7900f
am d00d2ff2: (-s ours) am 57933834: Merge "Fix Tests after cherry picks. [DO NOT MERGE]" into klp-modular-dev

* commit 'd00d2ff2079ca4e77173e3389834416494c7900f':
  Fix Tests after cherry picks. [DO NOT MERGE]