OSDN Git Service

am 3bfc0548: am 0fe8eac2: am 05e89b22: am 3246d88d: resolved conflicts for merge...
authorNarayan Kamath <narayan@google.com>
Mon, 12 May 2014 23:28:09 +0000 (23:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 May 2014 23:28:09 +0000 (23:28 +0000)
* commit '3bfc0548588c9908470115a9a979ce5d5679eac7':


Trivial merge