| commit | 4b4d8cc15da66f3699373a7d6a8f97a773c69528 | [log] [tgz] |
|---|---|---|
| author | tturney <tturney@google.com> | Tue Nov 08 12:37:04 2016 -0800 |
| committer | tturney <tturney@google.com> | Tue Nov 08 12:37:04 2016 -0800 |
| tree | 237a9ec2a3259e33c586a577a2c8285cf46b53fe | |
| parent | 20ba503c12101e21e073223f1ba2d89db378eb13 [diff] | |
| parent | e3934a229d89fa077bc0834e171f0fc3fb6b023f [diff] |
resolve merge conflicts of e3934a2 to stage-aosp-master Change-Id: Iad1c5483ca5094b950d9a116a0c934500f1756bf