OSDN Git Service

am 6a37681b: am 557282db: am 332bbced: am a8d273d3: am bbe5f88e: Merge "Conditionally...
authorYing Wang <wangying@google.com>
Mon, 12 May 2014 23:27:46 +0000 (23:27 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 May 2014 23:27:46 +0000 (23:27 +0000)
* commit '6a37681b7bb4ef2eb85ca11b6d98b5936c259da3':


Trivial merge