| commit | 1c76988f74407b53cf25acf5bcd1e72e8ed21e50 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Thu Jul 23 16:00:18 2015 -0700 |
| committer | Colin Cross <ccross@android.com> | Thu Jul 23 16:00:18 2015 -0700 |
| tree | 52b588bfa67cf84441ca3a8394cde8ddad5e38ef | |
| parent | 98dbed659c2149b718c34c4e768f8690ee96ea00 [diff] | |
| parent | d6e867ab9db5a2d23fa395995b4e27f6cf928390 [diff] |
resolved conflicts for merge of d6e867ab to master Change-Id: I4392f2d43cfeee59c5a35cf51589181fe499c4c0