OSDN Git Service

am f069c7f5: am ae5ac108: Merge "Fix build." into jb-mr1-dev
authorWink Saville <wink@google.com>
Tue, 14 Aug 2012 00:36:24 +0000 (17:36 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 14 Aug 2012 00:36:24 +0000 (17:36 -0700)
commit3016e47103fa3661cf1b670c69d8e26d7d23ccfe
tree9d802c58507170af0c8c23c3ce7e6bc183a9dc83
parent8920f1cc730f994cc46fccb427e6b602aaa4fcef
parentf069c7f58d4f41c5da20222a3f31fc5ef8084dd9
am f069c7f5: am ae5ac108: Merge "Fix build." into jb-mr1-dev

* commit 'f069c7f58d4f41c5da20222a3f31fc5ef8084dd9':
  Fix build.