OSDN Git Service

am ef23eb24: (-s ours) am beda6e2b: Merge "Revert "Add a (hidden) mapping for REMOTE_...
authorPaul Mclean <pmclean@google.com>
Thu, 27 Aug 2015 10:13:19 +0000 (10:13 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:13:19 +0000 (10:13 +0000)
* commit 'ef23eb24d5f7c3cc62b46dc01b6545a6b7fdbf2a':


Trivial merge