diff options
author | Amith Yamasani <yamasani@google.com> | 2012-08-22 18:19:19 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-22 18:19:20 -0700 |
commit | 2c1dfa29b40a988e3ea8f6922768465743aafddc (patch) | |
tree | f9ab6b9142cfc0a7642c131abdfa3b5761ea4ab3 /core/res/Android.mk | |
parent | 3451dc90648b8bd176030425ce91c019460ba88c (diff) | |
parent | 0cd867c83e726c88355375af4d14ee83f3339bbe (diff) | |
download | frameworks_base-2c1dfa29b40a988e3ea8f6922768465743aafddc.zip frameworks_base-2c1dfa29b40a988e3ea8f6922768465743aafddc.tar.gz frameworks_base-2c1dfa29b40a988e3ea8f6922768465743aafddc.tar.bz2 |
Merge "Fix deadlock in removing a user" into jb-mr1-dev
Diffstat (limited to 'core/res/Android.mk')
0 files changed, 0 insertions, 0 deletions