| commit | f9bacbdfbae2d00e4c7535b74c0736b757f57702 | [log] [tgz] |
|---|---|---|
| author | dcashman <dcashman@google.com> | Fri Jul 24 16:02:22 2015 -0700 |
| committer | dcashman <dcashman@google.com> | Fri Jul 24 16:02:22 2015 -0700 |
| tree | 9a7f55d2b4d7093746e563c5ad4d4b0f69ba81c0 | |
| parent | 516e3b2c03fc5f64f0d12c4b2f0fb6c80a9b8477 [diff] | |
| parent | 950a8988a198ac8f6d3e6be4bfe5c797f01689a7 [diff] |
resolve merge conflicts of 950a898 to lollipop-mr1-cts-dev. Change-Id: I86fbe33e335cf833af22986e4b78ac3ef3004288