| commit | 1dc22fa9ea2b36d2474fede56d0ae789e747d001 | [log] [tgz] |
|---|---|---|
| author | Yang Ni <yangni@google.com> | Mon Apr 13 23:48:22 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Apr 13 23:48:24 2015 +0000 |
| tree | 624baeeb55e4d59644d7f3370c1281b93e25f9e7 | |
| parent | 2d38b75cdc4884a228140ba3d3b012eb87eb4435 [diff] | |
| parent | 765ef49ddbceecd2099982e85684cddd4dad93cb [diff] |
Merge "resolved conflicts for merge of a0be50e4 to master"