OSDN Git Service

am 81f03898: am ba526a28: am d00d2ff2: (-s ours) am 57933834: Merge "Fix Tests after...
authorDeepanshu Gupta <deepanshu@google.com>
Thu, 2 Oct 2014 09:38:21 +0000 (09:38 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 2 Oct 2014 09:38:21 +0000 (09:38 +0000)
commit3a8634010676413b2373c074ffbdea21bff33dba
tree66c0ed78f6719516468fa3d9e16f74d2b0601228
parent16df192a2b2ee07f92120456b6f95caf6e1f9ad4
parent81f03898e59400bb77eb6525956b06e6762b550e
am 81f03898: am ba526a28: am d00d2ff2: (-s ours) am 57933834: Merge "Fix Tests after cherry picks. [DO NOT MERGE]" into klp-modular-dev

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