OSDN Git Service

am 3a658cc5: am 2ecd9fc9: Merge "Fix another build break."
authorHui Shu <hush@google.com>
Mon, 12 May 2014 23:28:41 +0000 (23:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 May 2014 23:28:41 +0000 (23:28 +0000)
* commit '3a658cc545ca746c28dc9c1a9cf484b9ab06806d':


Trivial merge