summaryrefslogtreecommitdiffstats
path: root/core/java/android/app/admin
diff options
context:
space:
mode:
authorChristoph Studer <chstuder@google.com>2014-11-25 15:15:31 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-25 15:15:31 +0000
commit18032a083a0089c2b2f87b5bbb0c4c6626cccefd (patch)
tree65dfac689cc222cce2c1ed54bfc239186df5ce2d /core/java/android/app/admin
parent2bf5a4205d4beed7c8b5ffd53556c438260cf29e (diff)
parentfe6d4f094d2441314bb31fec10b520f80aeb481e (diff)
downloadframeworks_base-18032a083a0089c2b2f87b5bbb0c4c6626cccefd.zip
frameworks_base-18032a083a0089c2b2f87b5bbb0c4c6626cccefd.tar.gz
frameworks_base-18032a083a0089c2b2f87b5bbb0c4c6626cccefd.tar.bz2
am fe6d4f09: am 30646d87: am 67142495: Merge "Fix MediaStyle API comments" into lmp-mr1-dev
* commit 'fe6d4f094d2441314bb31fec10b520f80aeb481e': Fix MediaStyle API comments
Diffstat (limited to 'core/java/android/app/admin')
0 files changed, 0 insertions, 0 deletions