tree 505d2b8385f89d1ba6840252b2664a291880109a
parent 4afbba6ebbd7b71774a09a9d74f2ee30352d64a1
parent acb058bf9fe822b104acbede223b4d62aa8ce782
author Xavier Ducrohet <xav@google.com> 1386192510 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1386192511 +0000

Merge "Fix synchronization when preparing ids." into klp-dev