tree a4dd8b0b981cf450d69061e43fca236edcbb551a
parent 3a2c4b9d52c0002854c3cdab136403f8124346e6
parent 5217cacbd9f382068bb9e176cd5a0b15388a335c
author Jeff Sharkey <jsharkey@google.com> 1450651243 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1450651243 +0000

Merge "Make JobSchedulerService encryption aware."