diff options
| author | Doug Zongker <dougz@google.com> | 2013-01-29 11:12:12 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-01-29 11:12:12 -0800 |
| commit | 3400ee257c23e33f81de71bd632fca361099e4cb (patch) | |
| tree | 4a58a5f5dbb0c6c78162f61759970d8c1f208424 /libpackagelistparser/packagelistparser_test.cpp | |
| parent | 0060935e1dc2fa7c5b629f845e3c031d7b2112c7 (diff) | |
| parent | 76dd8e33689292e6255b090da7408fba76919424 (diff) | |
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
Diffstat (limited to 'libpackagelistparser/packagelistparser_test.cpp')
0 files changed, 0 insertions, 0 deletions