OSDN Git Service

am 14200f8a: (-s ours) am 607a040d: Merge "Add a mechanism for products to specify...
authorChristopher Tate <ctate@google.com>
Thu, 27 Aug 2015 06:48:38 +0000 (06:48 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 06:48:38 +0000 (06:48 +0000)
* commit '14200f8af2924c441803319e6937fdcf7ecd4ffb':


Trivial merge