summaryrefslogtreecommitdiffstats
path: root/rs
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2014-06-12 21:07:25 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-12 21:07:25 +0000
commit9a0485aa567c99157e45d08e9712a281f34ffc5f (patch)
treee1099b2202350be49f986c8fbb8bad036309c871 /rs
parent8525fe8d0a5a886704307055ef211fc911997783 (diff)
parent1ef888e564926b78aeb02ef1085be2f72227b862 (diff)
downloadframeworks_base-9a0485aa567c99157e45d08e9712a281f34ffc5f.zip
frameworks_base-9a0485aa567c99157e45d08e9712a281f34ffc5f.tar.gz
frameworks_base-9a0485aa567c99157e45d08e9712a281f34ffc5f.tar.bz2
am 1ef888e5: Merge "Add service_contexts to policy update bundles."
* commit '1ef888e564926b78aeb02ef1085be2f72227b862': Add service_contexts to policy update bundles.
Diffstat (limited to 'rs')
0 files changed, 0 insertions, 0 deletions