tree 5b8e8d9c0ca0eccf12b5e4866238f9d097efea7c
parent 7e105203923041986a1bd125d86495663fee3abf
parent 1eb6ec56c28aae79dadb62e63e245745fe9485a1
author Josh Gao <jmgao@google.com> 1456349819 +0000
committer android-build-merger <android-build-merger@google.com> 1456349819 +0000

resolve merge conflicts of 557749e55b to klp-modular-dev DO NOT MERGE am: bdfb431467  -s ours
am: 1eb6ec56c2

* commit '1eb6ec56c28aae79dadb62e63e245745fe9485a1':
  Don't create tombstone directory. DO NOT MERGE