OSDN Git Service

Merge "Fix build" into mnc-dev
authorChris Craik <ccraik@google.com>
Thu, 28 May 2015 22:34:53 +0000 (22:34 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 28 May 2015 22:35:00 +0000 (22:35 +0000)
commit2df124b8547c4ba7a2b0c9903f21811583f74184
tree22e12c2bca17ef680bdf88004e1131f8035c36c8
parent4562f0bc898317887f82d62472a3bbbe7b4517f3
parent469fb1efd6408e00f39e5ac98e129f10c2180c7d
Merge "Fix build" into mnc-dev