| commit | 928cb3f9f814bf5fafde026377c6a47c0729ff41 | [log] [tgz] |
|---|---|---|
| author | William Luh <williamluh@google.com> | Wed Jun 05 16:06:11 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 05 16:06:11 2013 -0700 |
| tree | 655e1bbf6f5d8b2f0e9eaffb1748ec15bcc69cdf | |
| parent | f31bca4fe71621860791773daed21d768b6a902a [diff] | |
| parent | aa396d3e67c5ee4cd301ade1848f31a523ea8564 [diff] |
am aa396d3e: resolved conflicts for merge of 8df53636 to jb-mr1-dev * commit 'aa396d3e67c5ee4cd301ade1848f31a523ea8564': Set explicit destination for CALL_PRIVILEGED