tree a4291c5cbf925129806fa58eb3fa4f4e6266c6e0
parent 67098d09637256a3aa1ddb451a2e25b1967bdd69
parent 217e8a2b4661d3ae6dc470a8dc07b3145c560c7e
author RoboErik <epastern@google.com> 1407519149 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1407368960 +0000

Merge "Change URI type metadata back to text" into lmp-dev