OSDN Git Service

Merge "fix build"
authorMathias Agopian <mathias@google.com>
Tue, 6 Aug 2013 23:06:09 +0000 (23:06 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 6 Aug 2013 23:06:09 +0000 (23:06 +0000)
commite1e476669a5ee25f2a3c2fe30170e0f9a89f30a4
tree0a5046a178e98c0d4057d816559b508243543a68
parent9e65879ebc633334bb061e8164c46602ad983c50
parent93c721273208bea4a5d705dce215437a7633fb5a
Merge "fix build"