tree f2a261c7b8645b7ad22418f9b32b9e666029babf
parent aea57c8b4834801a64d129c031049660b3c4bb6c
parent f07439fba4d96c45c3bc873ffbb497cf3fffb744
author John Spurlock <jspurlock@google.com> 1346080090 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1346080091 -0700

Merge "Beans in space." into jb-mr1-dev