tree 3acf9baaeac8427a99c27354e92b5d8daf0e1cc6
parent e2c15c25204b6a7d07b3051bc9bf77a0633469bf
parent b629e9865b79689d3bd10de76f33f429fd9d858a
author Christopher Tate <ctate@google.com> 1330553326 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1330553326 -0800

Merge "Merge: Introduce UpdateLocks"