summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorAmit Mahajan <amitmahajan@google.com>2014-11-26 12:09:47 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-26 12:09:47 +0000
commitbc2f1371bbeb0f66c24fafec22b9b18ca6e845cd (patch)
tree3309f729b01d4222f4cf7ba695914149f7dca79e /media
parente39f788950c60f6468a038f88e6dc7ac5ee65f8f (diff)
parent65940c4ceb43e81aa720a29a9bb84818bdaabcbc (diff)
downloadframeworks_base-bc2f1371bbeb0f66c24fafec22b9b18ca6e845cd.zip
frameworks_base-bc2f1371bbeb0f66c24fafec22b9b18ca6e845cd.tar.gz
frameworks_base-bc2f1371bbeb0f66c24fafec22b9b18ca6e845cd.tar.bz2
am 65940c4c: am 476520f7: am 3749541a: Merge "Adding helper functions to retrieve settings that are stored per subId." into lmp-mr1-dev
* commit '65940c4ceb43e81aa720a29a9bb84818bdaabcbc': Adding helper functions to retrieve settings that are stored per subId.
Diffstat (limited to 'media')
0 files changed, 0 insertions, 0 deletions