OSDN Git Service

am 0158f8f7: am 0003192c: am 2bea94ba: Merge "Fix up android.core CTS tests."
authorNarayan Kamath <narayan@google.com>
Fri, 21 Feb 2014 18:35:24 +0000 (10:35 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Feb 2014 18:35:24 +0000 (10:35 -0800)
* commit '0158f8f71c78caa0ff8c02ddc2d6698cc90214dd':
  Fix up android.core CTS tests.


Trivial merge