diff options
| author | John Spurlock <jspurlock@google.com> | 2012-11-08 07:43:15 -0500 |
|---|---|---|
| committer | John Spurlock <jspurlock@google.com> | 2012-11-08 07:43:15 -0500 |
| commit | 805337ab5fb2adf108726b351319d77007577bb4 (patch) | |
| tree | 8337e8af21cdbe7c4ffa8b0614b53e5fbb2afdc5 /core/java/android/accounts/AccountManager.java | |
| parent | 9a962d7c7df9ff762e3d9798cde868ad73b164db (diff) | |
| parent | ef44a77f9181c13140c67988356b3ed3f5177434 (diff) | |
| download | frameworks_base-805337ab5fb2adf108726b351319d77007577bb4.zip frameworks_base-805337ab5fb2adf108726b351319d77007577bb4.tar.gz frameworks_base-805337ab5fb2adf108726b351319d77007577bb4.tar.bz2 | |
resolved conflicts for merge of ef44a77f to jb-mr1-dev-plus-aosp
Change-Id: Iad4319796be4b9ad74580f8c20a4e8cb30569f87
Diffstat (limited to 'core/java/android/accounts/AccountManager.java')
0 files changed, 0 insertions, 0 deletions