tree 8f2afbd8b76c72f32fc5f74b30ca6610c226133b
parent a38ec2b7d4324965d55a020baf4ad8b979d69597
parent 97814ab2a3355ca94122e692660b61796d5ab7af
author Jean-Baptiste Queru <jbq@google.com> 1310508086 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1310508086 -0700

Merge "resolved conflicts for merge of 8f1f5b06 to gingerbread-plus-aosp" into gingerbread-plus-aosp