commit | 8f2a9c0043081f0008bfadc50bb7cbc010a2b3cb | [log] [tgz] |
---|---|---|
author | Guang Zhu <guangzhu@google.com> | Mon Oct 22 11:55:47 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 22 11:55:47 2012 -0700 |
tree | 05c19f102fbc03d20b45b4bacb00de45385fe1af | |
parent | 86a52bec4b0134e540cc5c546da4e88dc2d62487 [diff] | |
parent | 6a07244fa83a4c6296d8a743238b6bd936bfb3ba [diff] |
am 6a07244f: am a023f4f6: Merge "Prevent sync state changes when user is a monkey" into jb-mr1-dev * commit '6a07244fa83a4c6296d8a743238b6bd936bfb3ba': Prevent sync state changes when user is a monkey