OSDN Git Service

am f6e67197: (-s ours) am 7aa6fc67: Merge "docs: Re-added gms_lists.js and gcm_lists...
authorQuddus Chong <quddusc@google.com>
Thu, 27 Aug 2015 10:37:10 +0000 (10:37 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:37:10 +0000 (10:37 +0000)
* commit 'f6e67197ddd0f535086ffe940081b128b54593d0':


Trivial merge