OSDN Git Service

Merge "Work Profile Security Challenge: Finalised strings" into nyc-dev
authorMahaver Chopra <mahaver@google.com>
Thu, 17 Mar 2016 18:19:23 +0000 (18:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 17 Mar 2016 18:19:23 +0000 (18:19 +0000)
commit0ed1e25a2218322fe6672c0752fed30cf80d0483
treed801e7fba7d9bf3895e68876c787b2891a23443a
parent1e148a30941c8011c0ad2a78aad0c0e0f2182e22
parent78a4bcd4196450d245adebec15aaae2be2778493
Merge "Work Profile Security Challenge: Finalised strings" into nyc-dev
am: 78a4bcd

* commit '78a4bcd4196450d245adebec15aaae2be2778493':
  Work Profile Security Challenge: Finalised strings