OSDN Git Service

am 636dc20d: resolved conflicts for merge of ad495272 to master
authorYing Wang <wangying@google.com>
Thu, 20 Mar 2014 22:28:02 +0000 (15:28 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 Mar 2014 22:28:02 +0000 (15:28 -0700)
* commit '636dc20d1a2ddb44b345be5ad6e04024788ad90b':
  Fix embedded build


Trivial merge