OSDN Git Service

am 8988c93f: am 636dc20d: resolved conflicts for merge of ad495272 to master
authorYing Wang <wangying@google.com>
Mon, 12 May 2014 23:28:56 +0000 (23:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 May 2014 23:28:56 +0000 (23:28 +0000)
* commit '8988c93f79d7bdc5d780d0e0a8ed5ae27468aab4':


Trivial merge