| commit | ef4729efa34f8f0435d9cd73ea32748f7d3d60ee | [log] [tgz] |
|---|---|---|
| author | Randy Pan <zpan@google.com> | Thu Jun 16 03:47:51 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jun 16 03:47:52 2016 +0000 |
| tree | ba377987977c8077371fe984f74949b656e414d1 | |
| parent | f571fac6e8a29340b716be0dce40eb7f5bd96538 [diff] | |
| parent | b06d3a9bf298dd1a559405cbc377d752a5c84532 [diff] |
Merge "resolve merge conflicts of b95ca95 to master"