| commit | ee79ef84dad51881b362e2310f350c8f4865007a | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Tue Dec 11 15:26:15 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 11 15:26:15 2012 -0800 |
| tree | 2f49e3851ad2f12947f17dae9b42ae060bc28e16 | |
| parent | 2491f278b953008b78321b3b3bab2c519264cc60 [diff] | |
| parent | ace7404de8b9a5bd7566027a8a90d36d099a46f4 [diff] |
am ace7404d: resolved conflicts for merge of d7337fb9 to master * commit 'ace7404de8b9a5bd7566027a8a90d36d099a46f4': Play a tone when wireless charging begins.