OSDN Git Service

Merge "Fix master-gpl build."
authorBen Murdoch <benm@google.com>
Thu, 2 Jun 2011 14:30:42 +0000 (07:30 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 2 Jun 2011 14:30:42 +0000 (07:30 -0700)
commit23275e1410d2c368826ba24dd0f29ea718666647
tree7a3a6c678b3197bee2c0635db58fa004b9340da7
parent6ea85f710d3202b52ed43e19dad04aaa014dda94
parent6b864fac938e6226fe95e2352291d3c25eeb12e3
Merge "Fix master-gpl build."