OSDN Git Service

am 2a67840c: Fix a bad merge.
authorJeff Brown <jeffbrown@google.com>
Thu, 9 Jul 2015 23:01:33 +0000 (23:01 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 9 Jul 2015 23:01:33 +0000 (23:01 +0000)
commitbea4eaf567ec2b523529c6c360d2f1b127c78f57
treecb2d72fb15ef480702b7bc37e3d375faec1f67e0
parentcb23b7e89b7222a9593d0b1d93fc0e0fd7b3a415
parent2a67840c3c35a6267663e5d3ae921ee9ac614db9
am 2a67840c: Fix a bad merge.

* commit '2a67840c3c35a6267663e5d3ae921ee9ac614db9':
  Fix a bad merge.