tree f5b14a0577357c8dc339399c7f288f0a453cbf5a
parent 0e1236e8933239acbf66c3c1e816a5462fab0041
parent 31f114b6493949c7204cb4667850c66ccae6ffaa
author Robert Greenwalt <rgreenwalt@google.com> 1436556733 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436556733 +0000

am 31f114b6: am 46ae3b96: am 4a7d279c: am d06b5be4: am a5f831ed: Merge "Fix permissions." into mnc-dev

* commit '31f114b6493949c7204cb4667850c66ccae6ffaa':
  Fix permissions.