| commit | ca360e14afca5dc6742308f1e801a632377c15b7 | [log] [tgz] |
|---|---|---|
| author | Alan Viverette <alanv@google.com> | Wed Jan 28 00:22:02 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jan 28 00:22:03 2015 +0000 |
| tree | e0843b71b3238ff8b8e30a550855d958d7aad970 | |
| parent | b032cd1f52835134e142b19f73648442237cd0d1 [diff] | |
| parent | 4c05c4c216505dde1d9f088cfdb36d2512bcb4fd [diff] |
Merge "Fix fallout from merging e5743753 conflicts"