| commit | 4e50ad7f2be39d160e76ef5d8af5391bd4cd8a68 | [log] [tgz] |
|---|---|---|
| author | Aurimas Liutikas <aurimas@google.com> | Fri May 13 14:14:50 2016 -0700 |
| committer | Aurimas Liutikas <aurimas@google.com> | Fri May 13 14:14:50 2016 -0700 |
| tree | 76e6e06661a3b5f0fe5a928aace731c74bf399e1 | |
| parent | ede540ae94aa9637229b777defaeb51f782ef32a [diff] | |
| parent | eb50a5334b1a8599fced5039567d5c4f36c6e63e [diff] |
resolve merge conflicts of eb50a53 to nyc-dev-plus-aosp Change-Id: I7ace975b20e3ab7fa4803feb9f2f44caa92173e3