OSDN Git Service

am f5ff4356: am 69259b13: (-s ours) am 2c5aeeaa: Merge "Require permission for intern...
authorAmith Yamasani <yamasani@google.com>
Thu, 27 Aug 2015 18:29:22 +0000 (18:29 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 18:29:22 +0000 (18:29 +0000)
* commit 'f5ff43568df0646d23aa36de3f68eb521eee95cb':


Trivial merge