tree 5ba561315eff765e4a434ae56c55c3648defe5ec
parent 3e00cc070090fa3eab16792da90aa33823cd6db1
parent 06fa2bcce5dd80b406a23f980d8c9fac1524ebfd
author Jean-Baptiste Queru <jbq@google.com> 1287416018 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1287416018 -0700

Merge fb474872 from gingerbread-plus-aosp

Change-Id: I1bbb845a86a7b7df44ea175df3af22e5f47c44e3