commit | f81caa67c08a56b90605513406674fdbb6a135f5 | [log] [tgz] |
---|---|---|
author | Dianne Hackborn <hackbod@google.com> | Tue Nov 15 19:04:11 2011 -0800 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Nov 15 19:04:11 2011 -0800 |
tree | 292e5ba0cb97a91fbd909b0fc31b8a2b1f9adb82 | |
parent | 74266e51cf5fe12e47e7bbbd2d27ddc096b39880 [diff] | |
parent | f8d578c48532d733f44736fadf6c4d3fa9f8f6e8 [diff] |
Merge "Whoops, need to acquire lock." into ics-mr1