OSDN Git Service

am 387a095f: am dd22aee1: am 69c3f457: am dc7fee9f: Set up rules to merge AndroidMani...
authorYing Wang <wangying@google.com>
Mon, 12 May 2014 23:25:58 +0000 (23:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 May 2014 23:25:58 +0000 (23:25 +0000)
* commit '387a095fbd3c375e93c1c77c974f7bbe462933a6':


Trivial merge