diff options
author | Basavapatna Dattaguru <dattaguru@google.com> | 2011-01-26 21:51:49 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-26 21:51:49 -0800 |
commit | a33537c3f1dbe1a4fa57560c406bf45e8f52436e (patch) | |
tree | 0a5df2a7444ea5818070f79bc854421155de4acb /core/java/android/os/ServiceManager.java | |
parent | 55bf9bdbcb3cab86a776fe6b5493b9bcec99fc21 (diff) | |
parent | 9af5da5258d14c743150318e9887b7d10c0117d4 (diff) | |
download | frameworks_base-a33537c3f1dbe1a4fa57560c406bf45e8f52436e.zip frameworks_base-a33537c3f1dbe1a4fa57560c406bf45e8f52436e.tar.gz frameworks_base-a33537c3f1dbe1a4fa57560c406bf45e8f52436e.tar.bz2 |
am 9af5da52: Merge "Video editor CTS: Framework modifications" into honeycomb
* commit '9af5da5258d14c743150318e9887b7d10c0117d4':
Video editor CTS: Framework modifications
Diffstat (limited to 'core/java/android/os/ServiceManager.java')
0 files changed, 0 insertions, 0 deletions