tree 1771fee886132f7e306c62f36ad4f9675ce10103
parent 89630ec8777804b728c50caeb1ae6fcf810e435f
parent f2c278551c7818e16577c70a3dd4cba459162589
author Fabrice Di Meglio <fdimeglio@google.com> 1343425630 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1343425690 -0700

Merge "Fix the build" into jb-mr1-dev