OSDN Git Service

am 0d3accb7: am bee718b7: (-s ours) am 046decca: Merge "Use common xml file for multi...
authorSanket Padawe <sanketpadawe@google.com>
Thu, 27 Aug 2015 20:17:17 +0000 (20:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 20:17:17 +0000 (20:17 +0000)
* commit '0d3accb711bbfd8c31f9bbc228b0b3441fbd39ff':


Trivial merge