tree 1ea2282dc012a795ea0a377483a06c938488f2de
parent 54709cb20f0664cc16556110672c8ca4a9c17d7b
parent 718647ea61365c42080ccc1edc419a08336b3b2c
author Andy McFadden <fadden@android.com> 1276190537 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1276190537 -0700

Merge "Up the version to 1.3.0." into kraken