commit | 16248e3f23355e81ee70f873cd431217f11b7b8e | [log] [tgz] |
---|---|---|
author | William Luh <williamluh@google.com> | Wed Jun 05 16:13:56 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 05 16:13:56 2013 -0700 |
tree | c1fdbefdfb29f6d804cbc2847155c458f9197712 | |
parent | 15ad27b4b981c4808e1fa155e0cc74574c13a586 [diff] | |
parent | b1b88e861c0748dd317b1e0ec00cc1d295e0b795 [diff] |
am b1b88e86: am 7d8ea25e: am 9ca2bf95: am 928cb3f9: am aa396d3e: resolved conflicts for merge of 8df53636 to jb-mr1-dev * commit 'b1b88e861c0748dd317b1e0ec00cc1d295e0b795': Set explicit destination for CALL_PRIVILEGED