OSDN Git Service

am 51c86ef6: am 349e915d: am cb241895: am a9baf879: Merge "fix build"
authorColin Cross <ccross@android.com>
Mon, 12 May 2014 23:26:34 +0000 (23:26 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 May 2014 23:26:34 +0000 (23:26 +0000)
* commit '51c86ef672707d65a76189401c7a320609aabe10':


Trivial merge