OSDN Git Service

am fd015328: (-s ours) am cf2668fa: am 1cad8c7c: Merge "Fix a bug in the register...
authorNicolas Geoffray <ngeoffray@google.com>
Thu, 27 Aug 2015 04:18:57 +0000 (04:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 04:18:57 +0000 (04:18 +0000)
* commit 'fd0153280488f8cb0ef8ecdfa59114ad6e9257dc':


Trivial merge