OSDN Git Service

am 10345af5: am bea4eaf5: (-s ours) am 2a67840c: Fix a bad merge.
authorJeff Brown <jeffbrown@google.com>
Thu, 27 Aug 2015 16:20:21 +0000 (16:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 16:20:21 +0000 (16:20 +0000)
commit7d30a18d922e5ef045ec9ad2c1f4d0bbfa6e83e6
tree4e9052ca12f00de06c77cb3ce93ab1eb160e691b
parentf20f7ddd73fd42332bb547f0e1e5ecf4898faaf2
parent10345af541abdfbecd30b83f7c0057ffc9c756db
am 10345af5: am bea4eaf5: (-s ours) am 2a67840c: Fix a bad merge.

* commit '10345af541abdfbecd30b83f7c0057ffc9c756db':