OSDN Git Service

am cb241895: am a9baf879: Merge "fix build"
authorColin Cross <ccross@android.com>
Fri, 14 Feb 2014 00:58:46 +0000 (00:58 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 Feb 2014 00:58:46 +0000 (00:58 +0000)
commit349e915dafbcebafcf204bda12739f9287ae51ce
tree449c500273db0cbdef9f71e6c66cca5c85699ab4
parentb01233f26f8d4a028ac1def2330005c3dade070a
parentcb241895046e9827801811d8455be120ff2ea9f2
am cb241895: am a9baf879: Merge "fix build"

* commit 'cb241895046e9827801811d8455be120ff2ea9f2':
  fix build