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