| commit | b959a4070b56c9b08132eb8756759046c24c1384 | [log] [tgz] |
|---|---|---|
| author | Ian Coolidge <icoolidge@google.com> | Thu May 28 09:53:38 2015 -0700 |
| committer | Ian Coolidge <icoolidge@google.com> | Thu May 28 09:53:38 2015 -0700 |
| tree | 369e9af3d3092dcedf69b6d1d571c4dc4592cc81 | |
| parent | 12537f7bf197ba3a68e24744b8d92f18afe97c6d [diff] | |
| parent | 1f81b64b337832452e9ba1f530e612a685aebb82 [diff] |
resolved conflicts for merge of 1f81b64b to mnc-dev-plus-aosp Change-Id: I7997086b1d83bc5ee06068f82ca31c290389bc44