OSDN Git Service

am dd3f2e07: (-s ours) am 5a7a1041: am ad7fd29b: Don\'t bother going through the...
authorYing Wang <wangying@google.com>
Thu, 5 Dec 2013 22:50:08 +0000 (22:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 5 Dec 2013 22:50:08 +0000 (22:50 +0000)
* commit 'dd3f2e07aec719c286d4944c1526515e82830be3':


Trivial merge