diff options
| author | John Spurlock <jspurlock@google.com> | 2012-11-08 05:58:09 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-08 05:58:09 -0800 |
| commit | 426b050c433cbc3b6a97ee6568ee63540b0129c6 (patch) | |
| tree | 757758d462aac22ac4e91b53cd92aa434763586d /core/java/android/accounts/AccountManager.java | |
| parent | 0b435ae59ecc7333b600513d5784e6096c38ab96 (diff) | |
| parent | 805337ab5fb2adf108726b351319d77007577bb4 (diff) | |
| download | frameworks_base-426b050c433cbc3b6a97ee6568ee63540b0129c6.zip frameworks_base-426b050c433cbc3b6a97ee6568ee63540b0129c6.tar.gz frameworks_base-426b050c433cbc3b6a97ee6568ee63540b0129c6.tar.bz2 | |
am 805337ab: resolved conflicts for merge of ef44a77f to jb-mr1-dev-plus-aosp
* commit '805337ab5fb2adf108726b351319d77007577bb4':
Remove add widget transition jank (insecure).
Diffstat (limited to 'core/java/android/accounts/AccountManager.java')
0 files changed, 0 insertions, 0 deletions