OSDN Git Service

am e0683de5: am 37050124: am a413a4ae: Fix the build. DO NOT MERGE
authorJim Miller <jaggies@google.com>
Thu, 20 Mar 2014 16:24:01 +0000 (16:24 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 Mar 2014 16:24:01 +0000 (16:24 +0000)
commite397d90fbdc51c269b82e08dd363bb14d90230dc
tree5634344dac696d278f8c214e03e5c1d8ce7be5ee
parent11e0ead8118d97d0e76a98065a4811fdb01b2db2
parente0683de51e56d7a95c88c5c744f45c72a54a95bc
am e0683de5: am 37050124: am a413a4ae: Fix the build.  DO NOT MERGE

* commit 'e0683de51e56d7a95c88c5c744f45c72a54a95bc':
  Fix the build.  DO NOT MERGE