| commit | 1fdaace1b17ad651d1e5266bb227a26e76b91a50 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Thu Apr 04 17:27:44 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 04 17:27:44 2013 -0700 |
| tree | 8ec88638859b0e4802b5f7dd46222f5b2ebcdcee | |
| parent | ecc5b4363571688cb257c2bc9c5e24653efb86f4 [diff] | |
| parent | 80fdc9624e6d53a78031bf99d34e7c01d53ad66e [diff] |
am 80fdc962: Merge "Error on conflicting <uses-permission>" into jb-mr2-dev * commit '80fdc9624e6d53a78031bf99d34e7c01d53ad66e': Error on conflicting <uses-permission>