tree 5910c053efb8b92442ec84eea55f7362c252f0ea
parent 4eb5188ece32ee625ecdcddcb84c1132a7826a82
parent c357691d3aae8bb2913941267188e12594d5ca80
author Seigo Nonaka <nona@google.com> 1493323424 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1493323425 +0000

Merge "Fix Content Provider tests failing in ICS" into oc-dev