diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-03-10 07:56:59 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-10 07:56:59 -0800 |
| commit | 26d7eef69ef064ca716ed76220ca2984995882ed (patch) | |
| tree | 53527cff471cd4c9cd0c94a0d0862415e75b4a8e /services/jni/com_android_server_BatteryService.cpp | |
| parent | a3ae42ef0a94ce3cfc65a7e11d2e88dd11ea4c35 (diff) | |
| parent | 84edf14b62eaf3304252bb76b0b2ca3f518c8d54 (diff) | |
| download | frameworks_base-26d7eef69ef064ca716ed76220ca2984995882ed.zip frameworks_base-26d7eef69ef064ca716ed76220ca2984995882ed.tar.gz frameworks_base-26d7eef69ef064ca716ed76220ca2984995882ed.tar.bz2 | |
am 84edf14b: am cc08c439: Merge "UsbAccessory: Add URI string, replace type string with description" into honeycomb-mr1
* commit '84edf14b62eaf3304252bb76b0b2ca3f518c8d54':
UsbAccessory: Add URI string, replace type string with description
Diffstat (limited to 'services/jni/com_android_server_BatteryService.cpp')
0 files changed, 0 insertions, 0 deletions