tree 5550c45f6f7410e9ec9c9451406bce554b3d636d
parent a47776c9f889242b3bcff0ff2d113d50da342262
parent a295ba44793e5601c8574bdcb07313420aa6500c
author Geremy Condra <gcondra@google.com> 1351891351 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351891351 -0700

am a295ba44: Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-dev

* commit 'a295ba44793e5601c8574bdcb07313420aa6500c':
  Change android.permission.SERIAL_PORT to signature|system.