tree f690a3961b198805cb9ef1ae9a11296e85bba8c8
parent c7bc3d09bda82c0641035966559b911785ccf90e
parent 965b9699f1f21b5e6236b194f4601134106e6b53
author Gilles Debunne <debunne@google.com> 1289863381 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1289863381 -0800

Merge "Cherry-pick Ib76a95d9e7669016cf11b8b0add8843b438068ea from gingerbread"