| commit | 009ea5a04c38dd209b73d28cb867f05e63ec89cc | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Mon Sep 10 15:49:59 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Sep 10 15:49:59 2012 -0700 |
| tree | b108cf08405b3a50369514c90e345daa8f2aac47 | |
| parent | 4573e29faf40983f9d1df99bb0f506d77a868e05 [diff] | |
| parent | 8a9f5d42a5cc373439ee8bbb9185dcce9086770d [diff] |
Merge "USER_CURRENT_OR_SELF had the same int as USER_CURRENT!" into jb-mr1-dev