tree 5aaf40b0aa372b7f7be42a669de4494cbe46e5b6
parent cf0cf47545db558784563161d6d5324b07630a6e
parent 340ca8b7e81afe891b2d76a08e406eafc63c4fc8
author Narayan Kamath <narayan@google.com> 1406298877 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1406216164 +0000

Merge "Handle apps that share a UID with the system_server correctly." into lmp-dev