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)
commit8988c93f79d7bdc5d780d0e0a8ed5ae27468aab4
tree601880d40cbe599b5890f4593443ad3866e5d304
parent94db7c36be945e417993414d9ac6bc15f04b53ed
parent636dc20d1a2ddb44b345be5ad6e04024788ad90b
am 636dc20d: resolved conflicts for merge of ad495272 to master

* commit '636dc20d1a2ddb44b345be5ad6e04024788ad90b':
  Fix embedded build