| commit | 7d8ea25e479744e0b9e9d58a4daa3579631ca3d3 | [log] [tgz] |
|---|---|---|
| author | William Luh <williamluh@google.com> | Wed Jun 05 16:09:23 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 05 16:09:23 2013 -0700 |
| tree | 09bc56a32c5d82721a95f2768dbdfa7e332975c8 | |
| parent | 7a4a4cd08aac01aed1a6a3d2cb88f4bfdc6dac39 [diff] | |
| parent | 9ca2bf95f4f1a0682f593d65765bf9e211977efa [diff] |
am 9ca2bf95: am 928cb3f9: am aa396d3e: resolved conflicts for merge of 8df53636 to jb-mr1-dev * commit '9ca2bf95f4f1a0682f593d65765bf9e211977efa': Set explicit destination for CALL_PRIVILEGED