| commit | 769540c1ed68cb52b455630d3547a54aff71497a | [log] [tgz] |
|---|---|---|
| author | Yorke Lee <yorkelee@google.com> | Tue Jul 22 12:55:36 2014 -0700 |
| committer | Yorke Lee <yorkelee@google.com> | Tue Jul 22 12:55:36 2014 -0700 |
| tree | 6bd7977d7f259e333848785cdf655a50ea804065 | |
| parent | 70823030dc4aa425ad6d39a9bb5f71bdae7ae68d [diff] | |
| parent | 5cb300ef50e9942eef746319dd1b1b6e7c2c05e2 [diff] |
Merge commit '5cb300ef' into manualmerge Change-Id: I0a250709eca34fcbbfdd94cf1cf25195bce844b8