OSDN Git Service

am f6650edf: am d454d96b: am a0475a59: (-s ours) am d5cc3680: (-s ours) am 9db54b1e...
authorjeffhao <jeffhao@google.com>
Mon, 29 Oct 2012 20:52:18 +0000 (13:52 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 29 Oct 2012 20:52:18 +0000 (13:52 -0700)
* commit 'f6650edf4225b489e39bf560fed406c749ee0c5b':


Trivial merge