OSDN Git Service

am cf1f9d2d: fix bad merge conflict resolution
authorColin Cross <ccross@android.com>
Sat, 22 Mar 2014 00:46:19 +0000 (17:46 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 22 Mar 2014 00:46:19 +0000 (17:46 -0700)
commit5a7f5b2848c43dc27d7d5af9ecc3c156e6af5b43
treef543967ee41d3b740270f863f43c4d602d439794
parente31fb21d57768ea4d13b40b395f49d8fffa62b4f
parentcf1f9d2d67411b91c6bc07a12595753471d86b8b
am cf1f9d2d: fix bad merge conflict resolution

* commit 'cf1f9d2d67411b91c6bc07a12595753471d86b8b':
  fix bad merge conflict resolution