OSDN Git Service

am 2c1cc061: am 56c72f4c: am 5b886bb0: (-s ours) am 899daf75: am d7e89906: Update...
authorDeepanshu Gupta <deepanshu@google.com>
Thu, 27 Aug 2015 01:54:38 +0000 (01:54 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 01:54:38 +0000 (01:54 +0000)
* commit '2c1cc0610923e5491d1ea8230ed89018fdea1fec':
  Update platformDir search in tests. [DO NOT MERGE]


Trivial merge