| commit | 0060935e1dc2fa7c5b629f845e3c031d7b2112c7 | [log] [tgz] |
|---|---|---|
| author | Doug Zongker <dougz@google.com> | Tue Jan 29 11:06:39 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 29 11:06:39 2013 -0800 |
| tree | 4a58a5f5dbb0c6c78162f61759970d8c1f208424 | |
| parent | f61fb576e60458251d36e44c702cabe9c0dbe1e2 [diff] | |
| parent | 8cc97302b2cc42d70af3c6d84a6a46984a09fe24 [diff] |
am 8cc97302: resolved conflicts for merge of 0fe9742e to jb-mr1-dev-plus-aosp # Via Doug Zongker * commit '8cc97302b2cc42d70af3c6d84a6a46984a09fe24': add AID_LOOP_RADIO for control of loop radio device