OSDN Git Service

Merge "Fix the build"
authorJason Monk <jmonk@google.com>
Thu, 17 Dec 2015 16:38:36 +0000 (16:38 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 17 Dec 2015 16:38:36 +0000 (16:38 +0000)
commit24718b8dc67ecbf7aef41ee8ff84e4f06a0404b3
treef38ee315c381e6186c0adc733cce1ce19f671b72
parent5d0bdb9d90c1aa88c7f6942a9456bae32aaf1326
parent67d36c4074ab7ecc4c35e55fdcfa3ee6770a9a88
Merge "Fix the build"