OSDN Git Service

am 875b1fec: am 08fe57cb: (-s ours) am b4158f0e: Merge "Only offer migration between...
authorJeff Sharkey <jsharkey@google.com>
Thu, 27 Aug 2015 20:21:43 +0000 (20:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 20:21:43 +0000 (20:21 +0000)
* commit '875b1fec7a5f8e0b67581721d33459f85b36b338':


Trivial merge