OSDN Git Service

am d55d046d: am b1ed7e19: (-s ours) am ce68917c: Merge "Ensure per package and per...
authorSvetoslav Ganov <svetoslavganov@google.com>
Thu, 27 Aug 2015 19:25:49 +0000 (19:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 19:25:49 +0000 (19:25 +0000)
* commit 'd55d046df7f900541077a73e803e581c88c97aef':


Trivial merge