OSDN Git Service

am 3bc33097: am f6a9b877: Fix the build break.
authorHui Shu <hush@google.com>
Mon, 12 May 2014 23:28:39 +0000 (23:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 May 2014 23:28:39 +0000 (23:28 +0000)
* commit '3bc330977d3a507b09977623b05f7ce95f59f9a2':


Trivial merge