OSDN Git Service

Merge "fix build" into klp-modular-dev
authorRobert Ly <robertly@google.com>
Wed, 25 Jun 2014 18:57:23 +0000 (18:57 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 25 Jun 2014 03:44:18 +0000 (03:44 +0000)
commit823ce5298fec4d0d9f5773ce16af882e633f1f16
treec2859dca717771a84af56878237b9141457e2c34
parent259b1fa686dccdc4924aa3140d07865df85325db
parent925db3bc6ac334a81b3fde95e2a1c5a06280ac09
Merge "fix build" into klp-modular-dev