OSDN Git Service

Merge "Fix build part 2" into jb-mr1-dev
authorAmith Yamasani <yamasani@google.com>
Sat, 18 Aug 2012 00:08:33 +0000 (17:08 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 18 Aug 2012 00:08:33 +0000 (17:08 -0700)
commit427dccc0cdc315f6a4b2be9954ff16f802cd9a60
treea9c81e569f9eb993043ef083eabf621cbd6a2f57
parent5c6912c6f697e34d79447b0cd794a6d9edea72ab
parentfc6e0ca07e599de5229582efe29c4f78eabaa3b8
Merge "Fix build part 2" into jb-mr1-dev