OSDN Git Service

am 40ced75f: am 0af8bc1e: am c48da22b: am 8213b719: am 6e92ade0: am db24577b: Merge...
authorColin Cross <ccross@android.com>
Mon, 12 May 2014 23:28:42 +0000 (23:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 May 2014 23:28:42 +0000 (23:28 +0000)
* commit '40ced75f352fc634a94acdd414d86ab573b1102d':


Trivial merge