OSDN Git Service

Merge "Fix build." into lmp-dev
authorDianne Hackborn <hackbod@google.com>
Wed, 10 Sep 2014 00:40:54 +0000 (00:40 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 10 Sep 2014 00:40:55 +0000 (00:40 +0000)
commitd5adbec5271dca42d0f937b1c869601786cc2ad3
treeee582556d2bf2ad4cef59abdb7e0e0ba6aa597c1
parentf14fb34292a31b278501e325a7f89745a91abf5a
parentf5cc3644f6d246138d22f35d00f1ce562cd715d5
Merge "Fix build." into lmp-dev