| commit | 97bb1ad7c3c3df89d8a85d7103e919cc60ebbcf7 | [log] [tgz] |
|---|---|---|
| author | Jeff Hao <jeffhao@google.com> | Thu Sep 24 18:29:39 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Sep 24 18:29:39 2015 +0000 |
| tree | 5c29e5c2eb07ae12bfaea00f819dcf4edbc3e1eb | |
| parent | 5932fbb9238003cb968b7988ea508a887c0f1736 [diff] | |
| parent | b18d084f4bb8e2f69732a014b78f6378481d9906 [diff] |
Merge "resolved conflicts for f005d55f to master"