tree 2c2ab38e59faa7eaa8d7ad5d5f267f43e7e01043
parent 5a960a446dcd6e79da7aab07a6813935c072c35a
parent 15b0cc92cfb3433a294c064be147224eb839090d
author Jeff Sharkey <jsharkey@android.com> 1474526816 +0000
committer android-build-merger <android-build-merger@google.com> 1474526816 +0000

Rename should behave like create: avoid conflict. am: 2c89a4c170 am: 0e033491ca
am: 15b0cc92cf

Change-Id: I749c3c23308f25e960efeacdaf8849bfefb3cad5