tree 0b519375a6a1d6ca34edfaa66debb9ffc6690192
parent 90ea4c4d30ccafb51e024ab3c34a4655d06eec4c
parent 645c80654ff55f129a7d87873ee2ad7cf3350678
author Robert Greenwalt <rgreenwalt@google.com> 1322761333 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1322761333 -0800

Merge "Fix state synchronization problem." into ics-mr1