| commit | 8822d4befdb30452ad4276b42d89062938b51a1f | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Fri May 02 01:21:57 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri May 02 01:21:57 2014 +0000 |
| tree | 6267ed809918874cb256f0673c204c13544bcd47 | |
| parent | 71beb2090302a43d443e0215323762843d3c514c [diff] | |
| parent | fb0448ab4b42c1b390cd75c3660ec0de511b7b3b [diff] |
Merge "resolved conflicts for merge of 4f8cd188 to master"