OSDN Git Service

am 901a98c6: (-s ours) am 60ee2840: am 36c51fc2: Merge "Take into account that we...
authorCalin Juravle <calin@google.com>
Thu, 27 Aug 2015 04:07:22 +0000 (04:07 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 04:07:22 +0000 (04:07 +0000)
* commit '901a98c636b3d75688a90ee158c516e5ad8eaf0e':


Trivial merge