tree d933caed0997ed7e1a79230ceccc642d3c7d6fcb
parent d174629951530d183015d7f124c993dac9da46aa
parent 35da9685f0d3bb367b50aaa4c476b12907099f77
author Tao Bao <tbao@google.com> 1440787591 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440787591 +0000

am 35da9685: Merge "Use the basename of file_contexts from the info dict."

* commit '35da9685f0d3bb367b50aaa4c476b12907099f77':
  Use the basename of file_contexts from the info dict.