tree 4a58a5f5dbb0c6c78162f61759970d8c1f208424
parent 0060935e1dc2fa7c5b629f845e3c031d7b2112c7
parent 76dd8e33689292e6255b090da7408fba76919424
author Doug Zongker <dougz@google.com> 1359486732 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1359486732 -0800

am 76dd8e33: resolved conflicts for merge of 016806a7 to jb-mr1-dev-plus-aosp

# Via Doug Zongker
* commit '76dd8e33689292e6255b090da7408fba76919424':
  change AID_LOOP_RADIO uid assignment