OSDN Git Service

am bf3d3f8f: (-s ours) am c7891c6c: (-s ours) am ff2aed99: (-s ours) am b4d720f9...
authorBaligh Uddin <baligh@google.com>
Thu, 5 Dec 2013 22:45:17 +0000 (22:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 5 Dec 2013 22:45:17 +0000 (22:45 +0000)
* commit 'bf3d3f8fd015a834aaf54051cef1805f0b4a241f':


Trivial merge