OSDN Git Service

am 4efc4817: (-s ours) am 56c72f4c: am 5b886bb0: (-s ours) am 899daf75: am d7e89906...
authorDeepanshu Gupta <deepanshu@google.com>
Thu, 27 Aug 2015 23:39:08 +0000 (23:39 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 23:39:08 +0000 (23:39 +0000)
commit939571a8d346b8f838dc861b145586584aec2199
tree85c8017324e2357c479e01bef23304dc922aafed
parent87a1d17fb93260e43efa840d21484b9b4d457204
parent4efc48170ee1013303b92c0912cb35460167c057
am 4efc4817: (-s ours) am 56c72f4c: am 5b886bb0: (-s ours) am 899daf75: am d7e89906: Update platformDir search in tests. [DO NOT MERGE]

* commit '4efc48170ee1013303b92c0912cb35460167c057':