OSDN Git Service

am 5d2fadb1: (-s ours) am 529a793c: am daeb1d90: am c547a4d5: Please do not merge...
authorEd Heyl <ed@google.com>
Mon, 6 Feb 2012 21:14:03 +0000 (13:14 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 6 Feb 2012 21:14:03 +0000 (13:14 -0800)
* commit '5d2fadb1492c1a2dd5437fcfb4afde2b2c3df4bd':


Trivial merge