tree da549b52a3243a26098d7322d1831148b481db08
parent 2f0116fa3ab2153188e43e87b194afae7e4efb81
parent aa4110366813f29f6a71dbdee090ba823feb2efe
author Marco Nelissen <marcone@google.com> 1436895003 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1436895006 +0000

Merge "Use original path if translated path doesn't exist" into mnc-dev