| commit | 1ebf4ef18877b1fbf4d85bf80917aac660b44567 | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Mon Apr 28 21:20:00 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Apr 28 21:20:01 2014 +0000 |
| tree | 6e4a4d43a54aebecfbc235e2d76517338095c5df | |
| parent | 802667b20b2170ddce94d70a022b68b64b9a7493 [diff] | |
| parent | e929bee9bbb418b52fea877f5fff1449aab247fb [diff] |
Merge "Merge commit '734a78fb' into manualmerge"