tree 5c00e41bcf55bc172bd4567ca4b32e41812a1301
parent e73a0ab4944e0863c80838fad5af58f849c1abec
parent dd36901ac004a2fef88247f9f54059b24ee5118c
author Santos Cordon <santoscordon@google.com> 1401485517 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1401485517 +0000

Merge "Preempt build error from merge with CL (2/2)"