OSDN Git Service

am d1b45a73: am 84a20ac1: am 2c32144b: resolved conflicts for merge of 7cd7bd65 to...
authorColin Cross <ccross@android.com>
Mon, 12 May 2014 23:26:27 +0000 (23:26 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 May 2014 23:26:27 +0000 (23:26 +0000)
* commit 'd1b45a736c7843e355261ef5bfb8c75b87a77f31':


Trivial merge