tree 77a543c1c965aa588648ee586f0b53df06fde40f
parent 4b030f0bb3449538cb8a8a97612ab29c5ae25dd5
parent 56c72f4c50556fc3072460fedf83145d73eb6f96
author Deepanshu Gupta <deepanshu@google.com> 1440639761 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440639761 +0000

am 56c72f4c: am 5b886bb0: (-s ours) am 899daf75: am d7e89906: Update platformDir search in tests. [DO NOT MERGE]

* commit '56c72f4c50556fc3072460fedf83145d73eb6f96':
  Update platformDir search in tests. [DO NOT MERGE]