| commit | dd36901ac004a2fef88247f9f54059b24ee5118c | [log] [tgz] |
|---|---|---|
| author | Santos Cordon <santoscordon@google.com> | Fri May 30 13:21:13 2014 -0700 |
| committer | Santos Cordon <santoscordon@google.com> | Fri May 30 14:27:03 2014 -0700 |
| tree | 4c71daa7844c9c5ba35908bc37501593a1eb1149 | |
| parent | 2157b9dcef00eac182b557b4d78cb66c31eba1bd [diff] |
Preempt build error from merge with CL (2/2) Merging CL: Ib674e2e48efaa1cc97d1513dc2c2b27fdb343657 Change-Id: Ic4944b27f9d39dbaccb6baa5ba6761dc4663cd02