am 452ef231: Fix unnecessary assumption about source dir name
authorPyry Haulos <phaulos@google.com>
Thu, 24 Sep 2015 20:32:48 +0000 (20:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 24 Sep 2015 20:32:48 +0000 (20:32 +0000)
* commit '452ef231d18d5334b5ea30c9ee700d52ed0da505':
  Fix unnecessary assumption about source dir name


Trivial merge