Steven Ng 335e4bdf60 Merge "Add a Global setting for disabling OEM unlocking setting" into nyc-mr1-dev am: e333b2eb81 ...

am: a62fc512da

* commit 'a62fc512dae936ec1d8573cacbd4e649ecd9be1f':
  Add a Global setting for disabling OEM unlocking setting

Change-Id: I8e0f6f00599923be663c9808ffa187bbe014121c

2016-05-13 11:38:43 +00:00

..

java

Merge "Add a Global setting for disabling OEM unlocking setting" into nyc-mr1-dev am: e333b2eb81

2016-05-13 11:38:43 +00:00

jni

Merge "Move Vulkan layer path setup to ApplicationLoaders" into nyc-dev am: 7f0708390b am: 76766d29b3

2016-05-12 21:26:16 +00:00

res

Merge "Fix incorrect inheritance from TextAppearance to Widget." into nyc-dev am: 614c83d977 am: 04250248b9

2016-05-13 01:02:58 +00:00

tests

Merge "Refactored NetworkPolicyManagerService mUidRules." into nyc-dev am: de66540fd3 am: 443c032e52

2016-05-06 22:03:18 +00:00