diff options
author | Gilles Debunne <debunne@google.com> | 2010-09-27 21:03:40 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-27 21:03:40 -0700 |
commit | 747eb00eef784f7df746e61e7e714e4e422eb6d1 (patch) | |
tree | 25130bdb7ebd8daab68bba54d35759445bbdbc07 /services/java/com/android/server/sip/SipService.java | |
parent | b740491871fdb4782164406b850bc080978ee63c (diff) | |
parent | 4e9243d55ce183542c74550e503ea583643599a0 (diff) | |
download | frameworks_base-747eb00eef784f7df746e61e7e714e4e422eb6d1.zip frameworks_base-747eb00eef784f7df746e61e7e714e4e422eb6d1.tar.gz frameworks_base-747eb00eef784f7df746e61e7e714e4e422eb6d1.tar.bz2 |
am 4e9243d5: (-s ours) am 8d7057df: Merge "Updated assets in status bar. DO NOT MERGE." into gingerbread
Merge commit '4e9243d55ce183542c74550e503ea583643599a0'
* commit '4e9243d55ce183542c74550e503ea583643599a0':
Updated assets in status bar. DO NOT MERGE.
Diffstat (limited to 'services/java/com/android/server/sip/SipService.java')
0 files changed, 0 insertions, 0 deletions