OSDN Git Service

am a3a6c5b1: (-s ours) am 25361e3f: (-s ours) am 522466e6: (-s ours) am f2382657...
authorBaligh Uddin <baligh@google.com>
Tue, 16 Sep 2014 15:21:36 +0000 (15:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 16 Sep 2014 15:21:36 +0000 (15:21 +0000)
* commit 'a3a6c5b14225782b4e78505d31ebb163e61c8307':


Trivial merge