OSDN Git Service

am 82419868: (-s ours) am 3ced9617: Merge "Use original path if translated path doesn...
authorMarco Nelissen <marcone@google.com>
Thu, 27 Aug 2015 07:36:20 +0000 (07:36 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 07:36:20 +0000 (07:36 +0000)
commit38a3e80c6e26a4c7ed5aa027fc5adc32b759d3b2
tree715d547d2502de8d04de0ec12233b3183ce62c99
parent29171a640633d0cc393e24eb1c821f218501e198
parent82419868b924eaae21224acae3c267b17f3a59c7
am 82419868: (-s ours) am 3ced9617: Merge "Use original path if translated path doesn\'t exist" into mnc-dev

* commit '82419868b924eaae21224acae3c267b17f3a59c7':