OSDN Git Service

am 2a67840c: Fix a bad merge.
authorJeff Brown <jeffbrown@google.com>
Thu, 9 Jul 2015 20:47:34 +0000 (20:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 9 Jul 2015 20:47:34 +0000 (20:47 +0000)
commit8a5252fb46b279b713eef1f19e0a2c1f14d6f23e
treed388a27a88be6095710a50560ba05b897446c1b3
parent2ad03d0c3275c902d6c86dcef8f4bd91183d397f
parent2a67840c3c35a6267663e5d3ae921ee9ac614db9
am 2a67840c: Fix a bad merge.

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