| commit | f106d85ec9fe88dadf1acae422bb0d987d30d762 | [log] [tgz] |
|---|---|---|
| author | lihai <lihai@codeaurora.org> | Fri Nov 06 09:58:16 2015 +0800 |
| committer | lihai <lihai@codeaurora.org> | Fri Nov 06 10:01:20 2015 +0800 |
| tree | 7eee22be67fd1988887499ec418bc20321720168 | |
| parent | 447e7846207a725a524fa696fcc1716f4b4d4ea1 [diff] | |
| parent | 8470d3c0090c4b349cd543f4f9aa1cd4bf604943 [diff] |
Merge branch 'ui_dev_2.0' into android_ui.lnx.1.0-dev.1.0 Conflicts: Android.mk AndroidManifest.xml src/com/android/music/AudioPreview.java src/com/android/music/MediaPlaybackActivity.java src/com/android/music/MediaPlaybackService.java Change-Id: Ic8b0453512d6195a5b4b7f91fbd8fc5425880451