OSDN Git Service

am c94a531b: am 19753f45: am bbfebfad: resolved conflicts for merge of 303d2755 to...
authorJustin Koh <justinkoh@google.com>
Mon, 12 May 2014 23:25:49 +0000 (23:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 May 2014 23:25:49 +0000 (23:25 +0000)
* commit 'c94a531b086aed89fd90c12d9ec8a722c156b4e3':


Trivial merge