OSDN Git Service

am 35a9e339: am fc15f899: Fix build issues from bad merge
authorJason Sams <jsams@google.com>
Thu, 13 Mar 2014 10:53:01 +0000 (10:53 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 13 Mar 2014 10:53:01 +0000 (10:53 +0000)
commit21f97de0bc4871cd8759aa8edbf55eb97d4a6ff2
treed3991073f15b8526db2208527864ba0284b287a6
parent4a268affbf2a15d68171036a941c2404eae07833
parent35a9e339687a0c5423c3433ff0c335ad9e1e0656
am 35a9e339: am fc15f899: Fix build issues from bad merge

* commit '35a9e339687a0c5423c3433ff0c335ad9e1e0656':
  Fix build issues from bad merge