commit | bf82544a960a2079f3f53f9b69684d8e81410600 | [log] [tgz] |
---|---|---|
author | Santos Cordon <santoscordon@google.com> | Fri May 30 21:31:57 2014 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri May 30 21:31:57 2014 +0000 |
tree | 5c00e41bcf55bc172bd4567ca4b32e41812a1301 | |
parent | e73a0ab4944e0863c80838fad5af58f849c1abec [diff] | |
parent | dd36901ac004a2fef88247f9f54059b24ee5118c [diff] |
Merge "Preempt build error from merge with CL (2/2)"