tree 1e3360aacf4f6328d6a7f7a5bf0a86f7a3aa54c8
parent 9860f7aca0510059c315f9e7fa10351e03193003
parent f7f6886820208bdea0ae42a323baade4d1c939da
author Vladimir Chtchetkine <vchtchetkine@google.com> 1318971239 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1318971239 -0700

Merge "Cherry picked from c9a94b0f in master. Do not merge." into ics-mr0