OSDN Git Service

Merge "Fix build."
authorJeff Brown <jeffbrown@google.com>
Thu, 18 Jul 2013 23:38:40 +0000 (23:38 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 18 Jul 2013 23:38:41 +0000 (23:38 +0000)
commitbe94819065f241208913c6a9d66e09c579febac6
treee46a406ef8d872df15733107d6dec19176950a32
parent563057740d6e94233f9d3daf80b4c703f35fece8
parentb9ff71375a9cf55395984613eee767344ece47a9
Merge "Fix build."