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