OSDN Git Service

am 3caed58a: am 8fa3f443: am 54e7f53f: Merge "Fix build."
authorNarayan Kamath <narayan@google.com>
Wed, 12 Feb 2014 22:20:01 +0000 (22:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 12 Feb 2014 22:20:01 +0000 (22:20 +0000)
commitefe6e05ca849ab479240fcf508b4d7af189a2c11
tree143fb9f80b44a4d6da16182367da2b9b8dbdfd29
parent4de9111819638b70dd6fb58094d7a61477fc59da
parent3caed58ac7f439cfeefd2dd32d57f1d7d755bd29
am 3caed58a: am 8fa3f443: am 54e7f53f: Merge "Fix build."

* commit '3caed58ac7f439cfeefd2dd32d57f1d7d755bd29':
  Fix build.