OSDN Git Service

Merge commit '47eec246a9293616cb74d2c354be85201ec4e19e' into mergeit
authorJeff Sharkey <jsharkey@android.com>
Wed, 31 May 2017 15:05:30 +0000 (09:05 -0600)
committerJeff Sharkey <jsharkey@android.com>
Wed, 31 May 2017 15:05:30 +0000 (09:05 -0600)
commit7c236a0c7e11f9c2024a2d007d6bcd0705a4ca0f
tree469e64e29de6d4f1a7ba70a0874c03f3bf90421c
parent486e966bdeb9eef311aa63fe8aa102cbfe69a2bf
parent47eec246a9293616cb74d2c354be85201ec4e19e
Merge commit '47eec246a9293616cb74d2c354be85201ec4e19e' into mergeit

Change-Id: I988ae328e0e9bb99b086490cf2ef48ca19779d13
tests/robotests/src/com/android/settings/applications/MusicViewHolderControllerTest.java
tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java