tree a7c53dcf72d73b5d74425e4fffb63c8e047efcb5
parent dee10f1751a01b6c6d2baf50588c224e2e0c44eb
parent d40a5b55b87b9e350daaaf6b7b19014f2dfecc94
author Jeff Tinker <jtinker@google.com> 1456590568 +0000
committer android-build-merger <android-build-merger@google.com> 1456590568 +0000

Merge "Adjust mediadrmserver uid" into nyc-dev am: 1ba1eeca71
am: d40a5b55b8

* commit 'd40a5b55b87b9e350daaaf6b7b19014f2dfecc94':
  Adjust mediadrmserver uid