tree a8cca32f982d5127cb695917ef1b16aff80ed958
parent 8f4e289f8c1f4743a459b232b9e5ac9d58095139
parent ee2f7df9ee8a4f43c3b0858bad08a4f0a59a627f
author Jeff Sharkey <jsharkey@android.com> 1380227609 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1380227609 +0000

Merge "Tighten flags enforcement, API to test Uris." into klp-dev