Commits
Jean-Baptiste Queru authored and Android Git Automerger committed 7b5b20ef678M
am bd01583d: resolved conflicts for merge of b237bdb6 to gingerbread-plus-aosp Merge commit 'bd01583d6e936e93141d6b77aec9d8c99684d7a4' * commit 'bd01583d6e936e93141d6b77aec9d8c99684d7a4': move native services under services/
Showing diff tobd01583d6e9