| commit | 7d0c685c6df5543285c58adba8383df118b3ce15 | [log] [tgz] |
|---|---|---|
| author | Etan Cohen <etancohen@google.com> | Sat Apr 25 00:49:40 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Sat Apr 25 00:52:00 2015 +0000 |
| tree | 076e8195907e0e48311b5c317132f869cfb4b61b | |
| parent | 5291d4aeda2a4e7bfb6eeb33e0c910e8c14de82c [diff] | |
| parent | 3e77ce24a17564818a5fe8f4d20eac7285f1bcf7 [diff] |
Merge changes from topic 'mwd-merge-042415' * changes: Fix build - renaming variables. Merge commit 'a62b505' into merge2 Merge commit '77f10d8' into merge2 Merge commit '569b54e' into merge2 Merge commit 'f7aed89' into merge2 Merge commit '0751e61' into merge2 Merge commit '95ac444' into merge2