commit | 50ece5ec53661a51ce5a15f782fdcd747171bc02 | [log] [tgz] |
---|---|---|
author | Nick Kralevich <nnk@google.com> | Thu Jun 12 21:10:30 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 12 21:10:30 2014 +0000 |
tree | 0267f52c62c1083c935594c5a7b175741ed05595 | |
parent | 1434ea749f669b09aff3f7a98859d2593da32f61 [diff] | |
parent | 9a0485aa567c99157e45d08e9712a281f34ffc5f [diff] |
am 9a0485aa: am 1ef888e5: Merge "Add service_contexts to policy update bundles." * commit '9a0485aa567c99157e45d08e9712a281f34ffc5f': Add service_contexts to policy update bundles.