tree 221738db01144e9b7dba6821ed7d56732a9e8ba4
parent 24f4d6495e5094f2148dca88feaa0b65cb386685
parent f740908c5b5f39b47b9ddbe1e54ce27204e1c1aa
author Josh Gao <jmgao@google.com> 1456345141 +0000
committer android-build-merger <android-build-merger@google.com> 1456345141 +0000

Don\'t create tombstone directory. am: cb9625cbe5 am: 99b8a56616 am: 0cf99e2b61 am: 338f1802ee am: 3ee4a0be2a am: 7f0d750b2d am: 41f72f0537
am: f740908c5b  -s ours

* commit 'f740908c5b5f39b47b9ddbe1e54ce27204e1c1aa':
  Don't create tombstone directory.