OSDN Git Service

Merge "Fix mock of setApplicationRestrictions()" into oc-dev
authorEric Sandness <sandness@google.com>
Mon, 10 Apr 2017 12:27:17 +0000 (12:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 10 Apr 2017 12:27:17 +0000 (12:27 +0000)
commit0a6fd9847ce3a2d7eeeb89141570a1330dacdebc
tree5bb11e5ca614e8db948824cbb941102d29701537
parentf700d5cad7ed9834dd16635d7626586e9912f6d0
parentc9a6e756820ab766230163fb69b539fa6cba0eff
Merge "Fix mock of setApplicationRestrictions()" into oc-dev
am: c9a6e75682

Change-Id: I6abbe1bf0073e236f1379a2dca208f5d3eab5e7f