OSDN Git Service

am e397d90f: am e0683de5: am 37050124: am a413a4ae: Fix the build. DO NOT MERGE
authorJim Miller <jaggies@google.com>
Thu, 20 Mar 2014 16:33:29 +0000 (16:33 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 Mar 2014 16:33:29 +0000 (16:33 +0000)
commit3017a0157353cd0b34ef67ac15e8086f9f651d12
tree9a60abd0237fe903f37bd3c01872dc711c14fe29
parent09cb89414062b5b6b8830307797c83166e1b07d6
parente397d90fbdc51c269b82e08dd363bb14d90230dc
am e397d90f: am e0683de5: am 37050124: am a413a4ae: Fix the build.  DO NOT MERGE

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