OSDN Git Service

am 5c49a8df: (-s ours) am 4776bdf4: (-s ours) am c4a95d3c: (-s ours) am e5128031...
authorBaligh Uddin <baligh@google.com>
Fri, 14 Feb 2014 20:51:23 +0000 (20:51 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 Feb 2014 20:51:23 +0000 (20:51 +0000)
* commit '5c49a8dff24feab476d2c379fbb7e521f2996c8c':


Trivial merge